Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

public/config/index-prod.js

@@ -13,7 +13,7 @@
   window.SITE_CONFIG = {};
 
   // 在线api接口请求地址
-  window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/";
+  window.SITE_CONFIG["baseUrl"] = "https://admin.damajishi.cn/";
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG["domain"] = "./"; // 域名

src/views/modules/datacenter/product-analysis/index.vue

@@ -108,7 +108,6 @@
     <div
       style="
         padding: 10px;
-        height: 48vh;
         border: 1px solid #ccc;
         margin-top: 20px;
       "
@@ -197,6 +196,131 @@
           </el-table>
         </el-col>
       </el-row>
+      <el-row style="margin:20px 0" type="flex" justify="space-between">
+        <el-col :span="11"
+          ><div class="grid-content bg-purple">销售量TOP</div>
+          <el-table
+            :data="productList.saleConutList"
+            border
+            style="width: 100%"
+            height="35vh"
+          >
+            <el-table-column
+              align="center"
+              type="index"
+              label="排名"
+              width="50"
+            >
+            </el-table-column>
+            <el-table-column prop="date" label="商品名称">
+              <template slot-scope="scope">
+                <div style="display: flex; align-items: center">
+                  <div>
+                    <el-image
+                      style="width: 60px; height: 60px"
+                      :src="scope.row.productImg"
+                      :preview-src-list="[scope.row.productImg]"
+                    >
+                    </el-image>
+                  </div>
+                  <div style="margin-left: 10px; color: blue">
+                    {{ scope.row.productName }}
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="sortData"
+              label="销售量"
+              width="140"
+            >
+            </el-table-column> </el-table
+        ></el-col>
+        <el-col :span="11"
+          ><div class="grid-content bg-purple">销售额TOP</div>
+          <el-table
+            :data="productList.saleMoneyList"
+            border
+            style="width: 100%"
+            height="35vh"
+          >
+            <el-table-column
+              align="center"
+              type="index"
+              label="排名"
+              width="50"
+            >
+            </el-table-column>
+            <el-table-column prop="date" label="商品名称">
+              <template slot-scope="scope">
+                <div style="display: flex; align-items: center">
+                  <div>
+                    <el-image
+                      style="width: 60px; height: 60px"
+                      :src="scope.row.productImg"
+                      :preview-src-list="[scope.row.productImg]"
+                    >
+                    </el-image>
+                  </div>
+                  <div style="margin-left: 10px; color: blue">
+                    {{ scope.row.productName }}
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="sortData"
+              label="销售额"
+              width="140"
+            >
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+      <el-row style="" type="flex" justify="space-between">
+        <el-col :span="11"
+          ><div class="grid-content bg-purple">回复率TOP</div>
+          <el-table
+            :data="productList.repurchaseList"
+            border
+            style="width: 100%"
+            height="35vh"
+          >
+            <el-table-column
+              align="center"
+              type="index"
+              label="排名"
+              width="50"
+            >
+            </el-table-column>
+            <el-table-column prop="date" label="商品名称">
+              <template slot-scope="scope">
+                <div style="display: flex; align-items: center">
+                  <div>
+                    <el-image
+                      style="width: 60px; height: 60px"
+                      :src="scope.row.productImg"
+                      :preview-src-list="[scope.row.productImg]"
+                    >
+                    </el-image>
+                  </div>
+                  <div style="margin-left: 10px; color: blue">
+                    {{ scope.row.productName }}
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="sortData"
+              label="回复率（%）"
+              width="140"
+            >
+            </el-table-column> </el-table
+        ></el-col>
+      </el-row>
     </div>
   </div>
 </template>

src/views/modules/logistics-fare/logistics-template/index.vue

@@ -67,10 +67,20 @@ export default {
     };
   },
   created() {
-    this.searchForm = {
+    if (
-      name: "",
+      JSON.parse(sessionStorage.getItem("userInfo")).role === "ROLE_MERCHANT"
-      linkId: this.marketId ? this.marketId : this.shopId,
+    ) {
-    };
+      this.searchForm = {
+        name: "",
+        linkId: this.shopId,
+      };
+    } else {
+      this.searchForm = {
+        name: "",
+        linkId: this.marketId ? this.marketId : this.shopId,
+      };
+    }
+
     this.$nextTick(() => {
       this.$refs.oTable.reload();
     });
@@ -95,10 +105,19 @@ export default {
         });
     },
     Reset() {
-      this.searchForm = {
+      if (
-        name: "",
+        JSON.parse(sessionStorage.getItem("userInfo")).role === "ROLE_MERCHANT"
-        linkId: this.marketId ? this.marketId : this.shopId,
+      ) {
-      };
+        this.searchForm = {
+          name: "",
+          linkId: this.shopId,
+        };
+      } else {
+        this.searchForm = {
+          name: "",
+          linkId: this.marketId ? this.marketId : this.shopId,
+        };
+      }
       this.$refs.oTable.reload();
     },
     addFareTemplate() {

src/views/modules/operation-management/commodity/index.vue

@@ -345,6 +345,15 @@ export default {
           align: "center",
           field: "stockNum",
         },
+        {
+          title: "是否为预售商品",
+          align: "center",
+          field: "isAdvanceSell",
+          type: "jsx",
+          render: ({ row }) => {
+            return <span>{row.isAdvanceSell == 1 ? "是" : "否"}</span>;
+          },
+        },
         {
           title: "状态",
           // fixed: "right",

src/views/modules/operation-management/commodity/popup/add-or-update.vue

@@ -3,7 +3,7 @@
     <obj-modal
       class="obj-modal"
       ref="modal"
-      labelWidth="100px"
+      labelWidth="120px"
       :modalCols="modalCols"
       :modalConfig="modalConfig"
       :modalData="modalData"
@@ -279,7 +279,6 @@ export default {
         this.modalData.otherAttribute = [];
       }
       console.log(this.modalData);
-      
     },
     addSpecs() {
       console.log("123");
@@ -520,6 +519,37 @@ export default {
                 );
               },
             },
+            {
+              label: "是否为预售产品",
+              prop: "isAdvanceSell",
+              required: true,
+              rules: {
+                required: true,
+                message: "是否为预售产品",
+                trigger: "blur",
+              },
+              type: "jsx",
+              render: () => {
+                return (
+                  <el-select
+                    v-model={this.modalData.isAdvanceSell}
+                    placeholder="请选择销售单位"
+                  >
+                    {[
+                      { label: "是", value: "1" },
+                      { label: "否", value: "0" },
+                    ].map((item) => {
+                      return (
+                        <el-option
+                          label={item.label}
+                          value={item.value}
+                        ></el-option>
+                      );
+                    })}
+                  </el-select>
+                );
+              },
+            },
           ];
           break;
         case "销售信息":

src/views/modules/operation-management/role/popup/add-or-update.vue

@@ -109,9 +109,9 @@ export default {
           label: "权限字段",
           prop: "col",
           type: "Input",
-          required: true,
+          required: false,
           rules: {
-            required: true,
+            required: false,
             message: "请输入权限字段",
             trigger: "blur",
           },