bug修复

src/api/module/settings/index.js

@@ -27,10 +27,19 @@ export function changePayPassword(data) {
   })
 }
 
-// 获取验证码
+// 获取验证码 有两个接口
+// 1-修改登录账号/密码，获取验证码
 export function getTelphoneCode(id) {
   return request({
     url: '/local/seller/sendCodeMobile?mobile=' + id,
     method: 'get'
   })
 }
+// 2-修改 支付密码，获取验证码
+export function getEditPayPasswordCode(query) {
+  return request({
+    url: '/local/seller/sendMobile',
+    method: 'get',
+    params: query
+  })
+}

src/views/dashboard/PanelGroup.vue

@@ -9,7 +9,7 @@
           <div class="card-panel-text">
             总商品
           </div>
-          <count-to :start-val="0" :end-val="panelData.goodsTotal" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="panelData.goods_total" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -22,7 +22,7 @@
           <div class="card-panel-text">
             总订单
           </div>
-          <count-to :start-val="0" :end-val="panelData.ordersTotal" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="panelData.order_total" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -35,7 +35,7 @@
           <div class="card-panel-text">
             总收入
           </div>
-          <count-to :start-val="0" :end-val="panelData.totalMoney" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="panelData.total_price" :decimals="2" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -44,12 +44,12 @@
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
         </div>
-        <div class="xz-tip">{{(panelData.refundTotal < 100)? panelData.refundTotal : '99+' }}</div>
+        <div class="xz-tip">{{(panelData.refund_total < 100)? panelData.refund_total : '99+' }}</div>
         <div class="card-panel-description">
           <div class="card-panel-text">
             售后订单
           </div>
-          <count-to :start-val="0" :end-val="panelData.refundTotal" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="panelData.refund_total" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -72,7 +72,7 @@ export default {
     CountTo
   },
   mounted() {
-    console.log(75,this.panelData);
+    // console.log(75,this.panelData);
   },
   methods: {
     handleSetLineChartData(type) {

src/views/index.vue

@@ -122,10 +122,10 @@ export default {
   data() {
     return {
       panelData:{
-        goodsTotal:0, //商品总数
-        ordersTotal:0,//订单总数
-        totalMoney:0,//金额总数
-        refundTotal:0,//售后总数
+        goods_total:0, //商品总数
+        order_total:0,//订单总数
+        total_price:0,//金额总数
+        refund_total:0,//售后总数
 
       },
 
@@ -173,18 +173,15 @@ export default {
            }
         }
 
-
         this.lineChartData.maxMoneyData = maxMoney
         this.lineChartData.moneyData = money
         this.lineChartData.actualData = count
          this.lineChartData.months= actual
-        // this.lineChartData.countData = count
-        //console.log("response.data",response.data)
 
-        this.panelData.goodsTotal= response.data.goodsTotal
-        this.panelData.refundTotal= response.data.rettotal
-        this.panelData.ordersTotal= response.data.orderTotal.count
-        this.panelData.totalMoney= response.data.orderTotal.TotalPrice
+        this.panelData.goods_total= response.data.goods_total
+        this.panelData.refund_total= response.data.rettotal
+        this.panelData.order_total= response.data.order_total.count
+        this.panelData.total_price= response.data.order_total.total_price / 100
       });
     },
     handleSetLineChartData(type) {

src/views/system/freight/freight_list/index.vue

@@ -38,7 +38,6 @@
         <el-table-column label="模板名称" align="center" prop="name"/>
         <el-table-column label="排序" align="center" prop="sort"/>
         <el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="is_default"/>
-        <!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
         <el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="publish"/>
         <el-table-column label="创建时间" align="center" :formatter="formatTime" prop="created"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -159,7 +158,7 @@
         return publish
       },
       formatType(row) {
-        var typese = row.chargeType
+        var typese = row.charge_type
         var optDess = ''
         if (typese == 1) {
           optDess = "按重量"
@@ -248,8 +247,8 @@
           id: 0,
           sort: 0,
           name: "",
-          isDefault: 0,
-          chargeType: 0,
+          is_default: 0,
+          charge_type: 0,
           dispatching: [
             {
               a: "全国",

src/views/system/order/components/orderDetail.vue

@@ -407,7 +407,6 @@ export default {
         for(let i = 0; i < this.multipleSelection.length; i++) {
           // 批量补单 is_reissue 1-已补发；2-未补发
 
-
           // 首先，先发货了，才能补单
           if( this.multipleSelection[i].goods_status > 0 ) {
             if (this.multipleSelection[i].is_reissue) {
@@ -578,7 +577,6 @@ export default {
     },
     /** 修改 买家信息 */
     modifyinfo() {
-     // console.log(580,this.orderDetail);
       this.addressForm = {
         shipping_name: '',
         tel: '',
@@ -587,6 +585,10 @@ export default {
         areaList: []
       }
 
+      this.$nextTick(()=> {
+        this.$refs.ssqCascader.$refs.panel.activePath = []
+      });
+
       if(this.orderDetail.real_name) {
         this.addressForm.shipping_name = this.orderDetail.real_name;
       }
@@ -598,10 +600,12 @@ export default {
       if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
         //console.log(66,this.addressForm.areaList);
         this.addOrEditPlaceholder = this.orderDetail.provice + '/' + this.orderDetail.city + '/' + this.orderDetail.district;
+        this.onlyEidtPlaceholder = true;
         this.addressForm.areaList[0] = this.orderDetail.provice
         this.addressForm.areaList[1] = this.orderDetail.city
         this.addressForm.areaList[2] = this.orderDetail.district
       }else {
+        this.onlyEidtPlaceholder = false;
         this.addOrEditPlaceholder = "请选择具体的省市区"
         this.addressForm.areaList = []
       }
@@ -666,15 +670,12 @@ export default {
         return
       }
 
-      //debugger
-      // 省市区 转化  onlyEidtPlaceholder
+      // 省市区 转化
       let ssqLabelList = [];
-      if(this.onlyEidtPlaceholder) {
+      if(!this.onlyEidtPlaceholder) {
         ssqLabelList = this.$refs['ssqCascader'].getCheckedNodes()[0].pathLabels;
-        //console.log(11,ssqLabelList);
       }else {
         ssqLabelList = this.addressForm.areaList;
-        //console.log(22,ssqLabelList);
       }
 
       let params = {
@@ -803,7 +804,7 @@ export default {
     },
     handleChanges(value) {
       this.addressForm.areaList = value;
-      this.onlyEidtPlaceholder = true // 说明操作下拉进行完整的选择值操作了，即 this.addressForm.areaList 是数组，元素为id
+      this.onlyEidtPlaceholder = false // 说明操作下拉进行完整的选择值操作了，即 this.addressForm.areaList 是数组，元素为id
     },
   }
 }
@@ -834,13 +835,13 @@ export default {
   /deep/.el-input--medium .el-input__inner {
     height: 28px;
   }
-  /deep/input::-webkit-input-placeholder{
-    color:#606266;
-  }
-  /deep/input::-moz-placeholder{
-    color:#606266;
-    opacity: 1
-  }
+  /*/deep/input::-webkit-input-placeholder{*/
+  /*  color:#606266;*/
+  /*}*/
+  /*/deep/input::-moz-placeholder{*/
+  /*  color:#606266;*/
+  /*  opacity: 1*/
+  /*}*/
 
   .orderDetail {
     height: 660px;

src/views/system/settings/setpsd.vue

@@ -119,7 +119,7 @@
 </template>
 
 <script>
-  import {changeTelphone, getTelphoneCode,changeLoginPassword,changePayPassword } from '@/api/module/settings'
+  import {changeTelphone, getTelphoneCode,getEditPayPasswordCode,changeLoginPassword,changePayPassword } from '@/api/module/settings'
 
   export default {
     name: "Setpsd",
@@ -344,7 +344,7 @@
             }
           }, 1000)
         }
-        getTelphoneCode(this.setForm.name).then(res => {
+        getEditPayPasswordCode(this.setForm.name).then(res => {
           if(res.code === 1) {
             this.$message({type:"success",message: '验证码发送成功'});
           }else {