Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/router/routers.js

@@ -51,7 +51,7 @@ export const constantRouterMap = [
         path: 'data_forms',
         component: (resolve) => require(['@/views/home/data_forms'], resolve),
         name: 'data_forms',
-        meta: { title: '数据报表' }
+        meta: { title: '销量统计' }
       },
       {
         path: 'data_tables',

src/views/home/data_forms.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="orderType" @tab-click="getTableData">
+    <!-- <el-tabs v-model="orderType" @tab-click="getTableData">
       <el-tab-pane label="收款" name="1"></el-tab-pane>
       <el-tab-pane label="销量" name="2"></el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
     <div class="head-container">
       <el-form :model="query" inline label-position="left">
         <template v-if="orderType == 2">
@@ -109,22 +109,22 @@
         </el-table-column>
       </el-table>
       <el-table :data="tableData.data" v-loading="tableData.loading" v-if="orderType == 2">
-        <el-table-column label="商品名称" prop="productName"></el-table-column>
-        <el-table-column label="商品分类" prop="cateName"></el-table-column>
+        <!-- <el-table-column label="商品分类" prop="cateName"></el-table-column>
         <el-table-column label="商品描述" prop="productSkuName"></el-table-column>
-        <el-table-column label="单价" prop="price"></el-table-column>
+        <el-table-column label="单价" prop="price"></el-table-column> -->
+        <el-table-column label="商品名称" prop="name"></el-table-column>
         <el-table-column label="销量" prop="salesNum"></el-table-column>
         <el-table-column label="退单量" prop="refNum"></el-table-column>
-        <el-table-column label="销售金额" prop="salesAmount">
-          <template v-slot="scope">
-            ￥{{ scope.row.salesAmount }}
-          </template>
-        </el-table-column>
         <el-table-column label="退款金额" prop="refAmount">
           <template v-slot="scope">
             ￥{{ scope.row.refAmount }}
           </template>
         </el-table-column>
+        <el-table-column label="销售金额" prop="salesAmount">
+          <template v-slot="scope">
+            ￥{{ scope.row.salesAmount }}
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="head-container">
@@ -146,7 +146,7 @@ export default {
     return {
       timeValue: "",
       resetQuery: null,
-      orderType: "1",
+      orderType: "2",
       categorys: [],
       query: {
         createdAt: [],
@@ -169,7 +169,7 @@ export default {
     timeFilter(time) {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
     },
-    totalfilter(item,d) {
+    totalfilter(item, d) {
       let num = item + d
       return num.toFixed(2)
     }
@@ -362,9 +362,27 @@ export default {
 .collect_wrap {
   display: flex;
   gap: 14px;
+  justify-content: space-between;
+
+  .item:nth-child(1) {
+    background-image: url(../../assets/images/home/data_forms4.png);
+  }
+
+  .item:nth-child(2) {
+    background-image: url(../../assets/images/home/data_forms3.png);
+  }
+
+  .item:nth-child(3) {
+    background-image: url(../../assets/images/home/data_forms2.png);
+  }
+
+  .item:nth-child(4) {
+    background-image: url(../../assets/images/home/data_forms1.png);
+  }
 
   .item {
-    flex: 1;
+    background-size: 100% 100%;
+    width: 255px;
     display: flex;
     align-items: center;
     background-color: #f5f5f5;

src/views/home/home.vue

@@ -236,7 +236,7 @@
             <el-table-column label="金额" prop="salesAmount"></el-table-column>
           </el-table>
           <div class="head-container" style="padding-top: 20px;display: flex;justify-content: flex-end;">
-            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage"
+            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage + 1"
               @current-change="paginationChange" layout="total, prev, pager, next, jumper"></el-pagination>
           </div>
         </div>
@@ -767,7 +767,7 @@ export default {
       }
     },
     paginationChange(e) {
-      this.saleTablePage = e;
+      this.saleTablePage = e - 1;
       this.dateProduct();
     },
     // 获取销售额排行表格数据

src/views/product/add_shop.vue

@@ -734,6 +734,11 @@ export default {
             specInfo[index].suit = item.suit;
             specInfo[index].stockNumber = item.stockNumber;
             specInfo[index].isGrounding = item.isGrounding;
+            specInfo[index].salePrice = item.salePrice;
+            specInfo[index].memberPrice = item.memberPrice;
+            specInfo[index].costPrice = item.costPrice;
+            specInfo[index].originPrice = item.originPrice;
+            specInfo[index].firstShared = item.firstShared;
             return specInfo[index];
           });
           console.log(this.form.skuList);

src/views/product/components/stockHistory.vue

@@ -14,6 +14,13 @@
                         {{ scope.row.leftNumber + scope.row.stockNumber }}
                     </template>
                 </el-table-column>
+                <el-table-column label="订单编号" prop="orderNo">
+                    <template v-slot="scope">
+                        <router-link :to="{ path: '/order_manage/order_list', query: { orderNo: scope.row.orderNo } }">
+                            <el-link type="primary">{{ scope.row.orderNo }}</el-link>
+                        </router-link>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作描述" prop="type"></el-table-column>
                 <el-table-column :label="`${keysList[key]}`" prop="">
                     <template v-slot="scope">

src/views/product/unit.vue

@@ -23,9 +23,11 @@
                 <el-table-column label="操作" width="200">
                     <template v-slot="scope">
                         <el-button type="text" size="mini" round icon="el-icon-edit"
+                            :disabled="ShopId == scope.row.shopId ? false : true"
                             @click="$refs.addUnitRef.show(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
-                            <el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">删除</el-button>
+                            <el-button :disabled="ShopId == scope.row.shopId ? false : true" type="text" size="mini"
+                                round icon="el-icon-delete" slot="reference">删除</el-button>
                         </el-popconfirm>
                     </template>
                 </el-table-column>
@@ -47,6 +49,7 @@ export default {
     },
     data() {
         return {
+            ShopId: localStorage.getItem('shopId'),
             query: {
                 blurry: ''
             },

src/views/shop/components/fitment.vue

@@ -1,13 +1,8 @@
 <template>
     <div class="app-container">
-        <!-- <el-radio-group v-model="tableActive" @change="selectItemChange">
-            <el-radio-button :label="item.autokey" v-for="item in tableData" :key="item.autokey">
-                {{ item.title }}
-            </el-radio-button>
-        </el-radio-group> -->
         <div class="btn_wraps">
             <div class="btn" :class="{ active: tableActive == item.autokey }" v-for="item in tableData"
-                :key="item.autokey" @click="tableActive = item.autokey">
+                :key="item.autokey" @click="selectItemChange(item.autokey)">
                 {{ item.title }}
             </div>
         </div>
@@ -223,6 +218,7 @@ export default {
         },
         // 切换类型
         selectItemChange(key) {
+            this.tableActive = key
             this.selectItem = { ...this.tableData.find(item => item.autokey == key) }
         },
         // 获取装修数据

src/views/shop/notifications/index.vue

@@ -22,11 +22,14 @@
         </div> -->
 
         <!-- 查看图片 -->
-        <el-button v-if="url" type="primary" @click="dialogVisible = true" style="margin-bottom: 28px;">查看图片</el-button>
+        <el-button v-if="url" type="primary" @click="dialogVisible = true" style="margin-bottom: 28px;">订阅消息</el-button>
         <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
             <div style="width: 100%;text-align: center;">
                 <el-image style="width: 200px; height: 200px;" :src="url"></el-image>
             </div>
+            <div style="text-align: center;">
+                使用微信扫描二维码绑定订阅消息
+            </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="downloadUrl">下载</el-button>