Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!166

src/components/DragImageUpload/index.vue

@@ -259,7 +259,7 @@ export default {
       if (this.fileSize) {
         const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
-          this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          this.$message.error(`上传图片大小不能超过 ${this.fileSize} MB!`);
           return false;
         }
       }

src/components/ImageUpload/index.vue

@@ -238,7 +238,7 @@
         if (this.fileSize) {
           const isLt = file.size / 1024 / 1024 < this.fileSize;
           if (!isLt) {
-            this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+            this.$message.error(`上传图片大小不能超过 ${this.fileSize} MB!`);
             return false;
           }
         }

src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
     </transition>

src/views/business/channel/childs.vue

@@ -351,14 +351,12 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams= {
-        pageNum: 1,
-        pageSize: 10,
          name: "",
          mobile: "",
          provinceId:"",

src/views/business/channel/index.vue

@@ -288,15 +288,16 @@ export default {
   },
   watch: {
     // 根据渠道名称筛选渠道树
-    channelName(val) {
-      this.$refs.tree.filter(val);
-    }
+    //channelName(val) {
+      // this.$refs.tree.filter(val);
+    //}
   },
   mounted() {
      this.getProvinceList()
+
   },
   created() {
-    this.getList();
+     this.getList();
   },
   methods: {
     /** 查询用户列表 */
@@ -395,14 +396,12 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.pageParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams= {
-        pageNum: 1,
-        pageSize: 10,
          name: "",
          mobile: "",
          provinceId:"",

src/views/business/goods/add.vue

@@ -12,7 +12,7 @@
           <el-form-item label="商品主图:" prop="picUrl">
             <Upload v-model="mainPicUrl" :limit="10" />
             <br>
-            <div class="tip">第一张图片将作为商品列表图片,最多上传10张,多张图片之间可随意调整位置，支持jpg、png格式上传，建议使用尺寸800x800像素以上、大小不超过1M的正方形图片；</div>
+            <div class="tip">第一张图片将作为商品列表图片，最多上传10张，多张图片之间可随意调整位置，支持jpg、png格式，推荐750*750px；</div>
           </el-form-item>
         </el-col>
       </el-row>

src/views/business/salesite/index.vue

@@ -377,7 +377,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.channelList = this.channelCopyList;
-      this.queryParams.pageNum = 1;
+      this.pageParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

src/views/business/ticket/create.vue

@@ -23,13 +23,12 @@
             <image-upload
               :limit="1"
               :value="form.picUrl"
-              :file-size="50"
               :is-public="true"
               @input="pictureSelect"
             />
           </el-form-item>
           <div class="tip">
-            上传1张图片，支持jpg、png格式上传，建议使用尺寸800x800像素以上、大小不超过1M的正方形图片；
+            上传1张图片，支持jpg、png格式上传；
           </div>
           <el-form-item label="面值" prop="facePrice">
             <el-input

src/views/index.vue

@@ -11,7 +11,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     实时交易金额
                    </div>
                    <div
@@ -20,7 +20,7 @@
                    </div>
                   <div class="brief-item__others">
                     <div class="text">
-                      较昨天
+                      昨日同期
                     </div>
                     <div class="rate text-one-line">
                       <span class="rate__num">
@@ -46,7 +46,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     交易用户
                    </div>
                    <div
@@ -55,7 +55,7 @@
                    </div>
                   <div class="brief-item__others">
                     <div class="text">
-                      较昨天
+                      昨日同期
                     </div>
                     <div class="rate text-one-line">
                       <span class="rate__num">
@@ -81,7 +81,7 @@
              <el-col :span="6">
                <div class="brief-item">
                   <div class="info">
-                    <div class="title">
+                    <div class="m-title">
                      盲票销售张数
                     </div>
                     <div
@@ -90,7 +90,7 @@
                     </div>
                    <div class="brief-item__others">
                      <div class="text">
-                       较昨天
+                       昨日同期
                      </div>
                      <div class="rate text-one-line">
                        <span class="rate__num">
@@ -108,7 +108,6 @@
                          </span>
                          %
                        </span>
-
                      </div>
                    </div>
                   </div>
@@ -117,7 +116,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     新增经销商
                    </div>
                    <div
@@ -126,7 +125,7 @@
                    </div>
                   <div class="brief-item__others">
                     <div class="text">
-                      较昨天
+                      昨日同期
                     </div>
                     <div class="rate text-one-line">
                       <span class="rate__num">
@@ -784,7 +783,7 @@ export default {
       .brief-item {
         cursor: pointer;
         // width: calc(25% - 20px);
-        height: 125px;
+        // height: 125px;
         box-shadow: 0 0 16px 0 rgba(0,0,0,0.08);
         border-radius: 3px;
         padding: 15px 0px;
@@ -804,20 +803,22 @@ export default {
           }
         }
         .info {
-          overflow: hidden;
+          // overflow: hidden;
           padding-left: 10px;
-          .title {
+          .m-title {
             font-size: 13px;
             text-align: left;
+            margin: 0px;
           }
           .number {
             font-size: 23px;
             font-weight: bold;
             line-height: 1;
-            margin-top: 8px;
+            // margin-top: 8px;
             margin-right: 5px;
-            // white-space: nowrap;
-            // text-overflow: ellipsis;
+            padding-top:8px;
+            white-space: nowrap;
+            text-overflow: ellipsis;
             overflow: hidden;
           }
         }