搜索热词，pc端注释，管理端结算单订单号字段错误

manager/src/config/index.js

@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.101:8890',
-    buyer: 'http://192.168.0.101:8888',
-    seller: 'http://192.168.0.101:8889',
-    manager: 'http://192.168.0.101:8887'
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.101:8890',
+    // buyer: 'http://192.168.0.101:8888',
+    // seller: 'http://192.168.0.101:8889',
+    // manager: 'http://192.168.0.101:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/seller/bill/bill-detail.vue

@@ -156,7 +156,7 @@ export default {
         },
         {
           title: "订单编号",
-          key: "sn",
+          key: "orderSn",
           minWidth: 120,
           tooltip: true
         },
@@ -173,22 +173,31 @@ export default {
         },
         {
           title: "砍价商品结算价格",
-          key: "kanjiaSettlementPrice",
+          slot: "kanjiaSettlementPrice",
           render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
-            );
+            if (params.row.kanjiaSettlementPrice) {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
+              );
+            } else {
+              return h('div','￥0.00')
+            }
+            
           },
         },
         {
           title: "积分商品结算价格",
           key: "pointSettlementPrice",
           render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
-            );
+            if (params.row.pointSettlementPrice){
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
+              );
+            } else {
+              return h('div','￥0.00')
+            }
           },
         },
         {

manager/src/views/seller/shop/shopDetail.scss

@@ -78,6 +78,7 @@
   align-items: flex-start;
   line-height: 30px;
   margin-bottom: 2px;
+  position: relative;
 }
 
 .label {

manager/src/views/seller/shop/shopDetail.vue

@@ -133,6 +133,7 @@
             </span>
           </p>
           <p class="item">
+            
             <span class="label">营业执照号：</span>
             <span class="info">{{storeInfo.licenseNum}}</span>
           </p>
@@ -239,6 +240,7 @@
                   @on-change="selectDateRange"
                   placeholder="选择起始时间"
                   style="width: 200px"
+                  transfer
                 ></DatePicker>
               </Form-item>
               <Button @click="getOrderData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
@@ -321,6 +323,7 @@
                   @on-change="selectRefundGoodsDateRange"
                   placeholder="选择起始时间"
                   style="width: 200px"
+                  transfer
                 ></DatePicker>
               </Form-item>
               <Form-item label="商家名称" prop="storeName">
@@ -443,6 +446,7 @@
                   @on-change="selectRefundDateRange"
                   placeholder="选择起始时间"
                   style="width: 200px"
+                  transfer
                 ></DatePicker>
               </Form-item>
               <Form-item label="商家名称" prop="storeName">