Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

buyer/src/components/Search.vue

@@ -147,12 +147,14 @@ export default {
   cursor: pointer;
 }
 .store-search{
-  width:63px;
+  width:55.6px;
   padding: 0 9px;
   border-radius: 0;
+  border-radius: 3px;
   &:nth-child(2){
-    width:62px;
-    margin-left: -5px;
+    width:55px;
+    margin-left: -2px;
+    border-radius: 3px;
   }
 }
 .btn-div{

buyer/src/components/indexDecorate/modelList/Recommend.vue

@@ -161,7 +161,7 @@ export default {
           padding: 0 10px;
           font-size: 12px;
           >div:nth-child(1) {
-            width: 130px;
+
             margin-top: 30px;
             span:nth-child(1){
                 color: #fff;
@@ -169,7 +169,7 @@ export default {
                 padding: 0 5px;
                 background-color: #a25684;
                 display: block;
-                width: 120px;
+
                 overflow: hidden;
                 white-space: nowrap;
                 margin: 0 10px 10px 0;

buyer/src/pages/home/orderCenter/ApplyAfterSale.vue

@@ -12,7 +12,7 @@
       </div>
     </template>
     <template slot-scope="{ row }" slot="goodsPrice">
-      <div>{{row.goodsPrice | unitPrice('￥')}}</div>
+      <div>{{row.applyRefundPrice | unitPrice('￥')}}</div>
     </template>
     </Table>
     <div>

buyer/src/router/index.js

@@ -97,6 +97,14 @@ const ShopEntry = (resolve) =>
 
 Vue.use(Router);
 
+/**
+ * 解决重复点击菜单会控制台报错bug
+ */
+ const routerPush = Router.prototype.push
+ Router.prototype.push = function push(location) {
+   return routerPush.call(this, location).catch(error=> error)
+ }
+
 export default new Router({
   mode: "history",
   routes: [

manager/src/router/index.js

@@ -13,6 +13,14 @@ const RouterConfig = {
   routes: routers
 };
 
+/**
+ * 解决重复点击菜单会控制台报错bug
+ */
+const routerPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error=> error)
+}
+
 export const router = new VueRouter(RouterConfig);
 
 router.beforeEach((to, from, next) => {
@@ -44,3 +52,5 @@ router.afterEach((to) => {
   ViewUI.LoadingBar.finish();
   window.scrollTo(0, 0);
 });
+
+

manager/src/views/my-components/lili/upload-pic-thumb.vue

@@ -62,7 +62,7 @@ export default {
   },
   props: {
     value: {
-      type: Object
+      type: null
     },
     draggable: {
       type: Boolean,

manager/src/views/order/order/orderDetail.vue

@@ -587,7 +587,7 @@ export default {
             if (!params.row.goodsPrice) {
               return h("div", this.$options.filters.unitPrice(0, "￥"));
             }
-            return h("div", this.$options.filters.unitPrice(params.row.goodsPrice, "￥"));
+            return h("div", this.$options.filters.unitPrice(params.row.unitPrice, "￥"));
           },
         },
 
@@ -601,7 +601,7 @@ export default {
           key: "subTotal",
           minWidth: 100,
           render: (h, params) => {
-            return h("div", this.$options.filters.unitPrice(params.row.subTotal, "￥"));
+            return h("div", this.$options.filters.unitPrice(params.row.flowPrice, "￥"));
           },
         },
       ],
@@ -674,8 +674,7 @@ export default {
     },
     modifyPrice() {
       //默认要修改的金额为订单总金额
-      this.modifyPriceForm.price = this.orderInfo.order.subTotal;
-      console.log(this.modifyPriceForm.price)
+      this.modifyPriceForm.price = this.orderInfo.order.flowPrice;
       this.modal = true;
     },
     //修改订单金额提交

manager/src/views/region/index.vue

@@ -1,7 +1,11 @@
 <template>
   <Card>
     <Row class="operation">
-      <Button @click="handleAsyncRegion"  :loading="asyncLoading" type="primary" icon="md-add"
+      <Button
+        @click="handleAsyncRegion"
+        :loading="asyncLoading"
+        type="primary"
+        icon="md-add"
         >同步数据</Button
       >
     </Row>
@@ -10,7 +14,6 @@
         class="tree"
         :data="data"
         :load-data="loadData"
-        expand-node
         @on-select-change="changeTree"
       ></Tree>
       <div class="form">
@@ -27,7 +30,11 @@
             <Input v-model="formValidate.cityCode" />
           </FormItem>
           <FormItem label="行政区划级别" prop="cityCode">
-            <RadioGroup type="button" button-style="solid" v-model="formValidate.level">
+            <RadioGroup
+              type="button"
+              button-style="solid"
+              v-model="formValidate.level"
+            >
               <Radio disabled label="country">国家</Radio>
               <Radio disabled label="province">省份</Radio>
               <Radio disabled label="city">市</Radio>
@@ -95,16 +102,18 @@ import {
 export default {
   data() {
     return {
-      asyncLoading:false, // 加载状态
+      asyncLoading: false, // 加载状态
       num: 10, // 更新倒计时
-      modalFlag: false,  // 新增编辑标识
+      modalFlag: false, // 新增编辑标识
       timerNum: 10, // 定时器
       data: [], // 加载数据
       id: 0, // id
-      addValidate: { // 添加级别
+      addValidate: {
+        // 添加级别
         parentName: "无父级",
       },
-      formValidate: { // 表单数据
+      formValidate: {
+        // 表单数据
         adCode: "",
         cityCode: "",
         center: "",
@@ -112,7 +121,8 @@ export default {
         orderNum: "",
         level: "",
       },
-      ruleValidate: { // 验证规则
+      ruleValidate: {
+        // 验证规则
         adCode: [
           {
             required: true,
@@ -227,12 +237,13 @@ export default {
     },
     // 树结构点击事件
     changeTree(array, val) {
-      this.formValidate = val;
+      val.cityCode == "null" ? (val.cityCode = "") : val.cityCode;
+      this.$set(this, "formValidate", val);
     },
     // 异步加载数据
     loadData(item, callback) {
       item.loading = true;
-      console.log(item);
+      // console.log(item);
       getChildRegion(item.id).then((res) => {
         if (res.result.length <= 0) {
           item.loading = false;
@@ -302,7 +313,7 @@ export default {
           let timer;
           let number;
 
-          this.asyncLoading = true
+          this.asyncLoading = true;
 
           this.$Message.info({
             duration: this.timerNum,
@@ -315,9 +326,9 @@ export default {
                     on: {
                       click: () => {
                         this.$Message.destroy();
-                        this.asyncLoading = false
+                        this.asyncLoading = false;
                         clearInterval(number);
-                        clearTimeout(timer)
+                        clearTimeout(timer);
                       },
                     },
                   },
@@ -332,9 +343,9 @@ export default {
           }, 1000);
 
           timer = setTimeout(() => {
-            clearInterval(number)
+            clearInterval(number);
             asyncRegion().then((res) => {
-              this.asyncLoading = false
+              this.asyncLoading = false;
               this.$Message.loading("地区数据正在更新中！");
             });
           }, 10000);

manager/src/views/statistics/traffic.vue

@@ -43,7 +43,7 @@
 
     <Card class="card">
       <div>
-        <h4>客户增长报表</h4>
+        <h4>会员流量报表</h4>
         <Table class="table" stripe :columns="columns" :data="data"></Table>
 
       </div>

seller/src/router/index.js

@@ -13,6 +13,14 @@ const RouterConfig = {
   routes: routers
 };
 
+/**
+ * 解决重复点击菜单会控制台报错bug
+ */
+ const routerPush = VueRouter.prototype.push
+ VueRouter.prototype.push = function push(location) {
+   return routerPush.call(this, location).catch(error=> error)
+ }
+
 export const router = new VueRouter(RouterConfig);
 
 router.beforeEach((to, from, next) => {

seller/src/views/order/order/orderDetail.vue

@@ -643,7 +643,7 @@ export default {
           render: (h, params) => {
             return h(
               "div",
-              this.$options.filters.unitPrice(params.row.subTotal, "￥")
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
             );
           },
         },
@@ -900,7 +900,7 @@ dl dt {
 
 
 .search {
- 
+
 
   .div-item {
     line-height: 35px;