Merge branch 'master' of http://120.27.146.32:8888/wangfulong/shop-new

# Conflicts:
#	.env.production
#	dist/index.html
#	dist/static/css/app.1464b283.css
#	dist/static/css/app.99b54cb5.css
#	dist/static/css/app.fdf17a7e.css
#	dist/static/css/chunk-459ab837.020eda13.css
#	dist/static/js/chunk-08486bce.57498488.js
#	dist/static/js/chunk-08486bce.a40b81e7.js
#	dist/static/js/chunk-08486bce.ce91dabf.js
#	dist/static/js/chunk-7c2f4fe6.550cb155.js
#	dist/static/js/chunk-7c2f4fe6.7a118e6f.js
#	dist/static/js/chunk-7c2f4fe6.b1b23ecf.js

.env.development

@@ -2,11 +2,9 @@
 ENV = 'development'
 
 # 正式环境
-#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
-VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
+VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
 # 开发环境
-#VUE_APP_BASE_API = 'http://192.168.111.34:8200'
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
+#VUE_APP_BASE_API = 'http://192.168.111.36:8200'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -2,5 +2,7 @@
 ENV = 'production'
 
 # gfast管理系统/生产环境
+
 #VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
 VUE_APP_BASE_API = '/api/v1'
+

.env.staging

@@ -4,4 +4,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 #gfast管理系统/测试环境
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
+VUE_APP_BASE_API = '/stage-api'

dist/static/css/chunk-3a35df6c.04b54fdb.css

+.panel-group[data-v-2432b352]{margin-top:18px}.panel-group .card-panel-col[data-v-2432b352]{margin-bottom:32px}.panel-group .card-panel[data-v-2432b352]{height:108px;cursor:pointer;font-size:12px;position:relative;overflow:hidden;color:#666;background:#fff;box-shadow:4px 4px 40px rgba(0,0,0,.05);border-color:rgba(0,0,0,.05)}.panel-group .card-panel:hover .card-panel-icon-wrapper[data-v-2432b352]{color:#fff}.panel-group .card-panel:hover .icon-people[data-v-2432b352]{background:#40c9c6}.panel-group .card-panel:hover .icon-message[data-v-2432b352]{background:#36a3f7}.panel-group .card-panel:hover .icon-money[data-v-2432b352]{background:#f4516c}.panel-group .card-panel:hover .icon-shopping[data-v-2432b352]{background:#34bfa3}.panel-group .card-panel .icon-people[data-v-2432b352]{color:#40c9c6}.panel-group .card-panel .icon-message[data-v-2432b352]{color:#36a3f7}.panel-group .card-panel .icon-money[data-v-2432b352]{color:#f4516c}.panel-group .card-panel .icon-shopping[data-v-2432b352]{color:#34bfa3}.panel-group .card-panel .card-panel-icon-wrapper[data-v-2432b352]{float:left;margin:14px 0 0 14px;padding:16px;transition:all .38s ease-out;border-radius:6px}.panel-group .card-panel .card-panel-icon[data-v-2432b352]{float:left;font-size:48px}.panel-group .card-panel .xz-tip[data-v-2432b352]{float:left;background-color:#f4516c;color:#fff;width:24px;height:24px;border-radius:12px;line-height:24px;text-align:center;margin-top:18px;margin-left:-24px;animation:xzTip-data-v-2432b352 3s}.panel-group .card-panel .card-panel-description[data-v-2432b352]{float:right;font-weight:700;margin:26px;margin-left:0}.panel-group .card-panel .card-panel-description .card-panel-text[data-v-2432b352]{line-height:18px;color:rgba(0,0,0,.45);font-size:16px;margin-bottom:12px}.panel-group .card-panel .card-panel-description .card-panel-num[data-v-2432b352]{font-size:20px}@media (max-width:550px){.card-panel-description[data-v-2432b352]{display:none}.card-panel-icon-wrapper[data-v-2432b352]{float:none!important;width:100%;height:100%;margin:0!important}.card-panel-icon-wrapper .svg-icon[data-v-2432b352]{display:block;margin:14px auto!important;float:none!important}}.dashboard-promote .el-row[data-v-277bbc74]{margin-bottom:20px;font-size:14px}.dashboard-promote .el-row .jz[data-v-277bbc74]{height:500px}.dashboard-promote .el-row .kj[data-v-277bbc74]{height:300px}.dashboard-promote .el-row .xx[data-v-277bbc74]{height:200px}.git-res[data-v-277bbc74]{margin-top:20px}.git-res .el-link[data-v-277bbc74]{margin-right:30px}li[data-v-277bbc74],ul[data-v-277bbc74]{padding:0;margin:0;list-style:none}.product li[data-v-277bbc74]{margin-bottom:20px;float:left;width:150px}.dashboard-editor-container[data-v-277bbc74]{padding:32px;background-color:#f0f2f5;position:relative}.dashboard-editor-container .chart-wrapper[data-v-277bbc74]{background:#fff;padding:16px 16px 0;margin-bottom:32px}@media (max-width:1024px){.chart-wrapper[data-v-277bbc74]{padding:8px}}
\ No newline at end of file

dist/static/js/chunk-7c2f4fe6.7a118e6f.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,e,o){"use strict";o.d(e,"f",(function(){return a})),o.d(e,"b",(function(){return r})),o.d(e,"d",(function(){return c})),o.d(e,"a",(function(){return i})),o.d(e,"h",(function(){return u})),o.d(e,"g",(function(){return s})),o.d(e,"c",(function(){return d})),o.d(e,"i",(function(){return l})),o.d(e,"e",(function(){return h}));var n=o("b775");function a(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function r(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function c(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function u(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function l(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}},"74bc":function(t,e,o){"use strict";o.r(e);var n=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div")},a=[],r=o("2ca7"),c=o("6b1f"),i=(o("b775"),{name:"Platformlogin",created:function(){this.gotosso()},methods:{gotosso:function(){var t=this,e=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:e}).then((function(e){if(""!=e.token)Object(c["g"])().then((function(e){if(1===e.code)switch(e.data.state){case 0:switch(e.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillBrandInf"});break;case 2:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var o=e.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:o}});break}else e&&e.msg?r["Notification"].error({title:"提示：",message:e.msg}):r["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var o=window.location.host;setTimeout((function(){window.location.href="http://sso.jxhh.com/logout?redirect=http://"+o+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var e=window.location.host;setTimeout((function(){window.location.href="http://sso.jxhh.com/logout?redirect=http://"+e+"/login"}),1e3),t.loading=!1}))}}}),u=i,s=o("cba8"),d=Object(s["a"])(u,n,a,!1,null,null,null);e["default"]=d.exports}}]);
\ No newline at end of file

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/api/webSite.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取渠道id
 export function indexInfo(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
     method: 'get',
     params
 
@@ -12,7 +12,7 @@ export function indexInfo(params) {
 // 获取所有域名
 export function getdomain(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
     method: 'get',
     params
 
@@ -21,7 +21,7 @@ export function getdomain(params) {
 // 获取官网设置接口
 export function webSite(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
     method: 'get',
     params
   })
@@ -30,7 +30,7 @@ export function webSite(params) {
 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
 export function getallCloudList(params) {
   return request({
-    url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
     method: 'get',
     params
   })

src/layout/components/Navbar.vue

@@ -5,7 +5,10 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
     <div style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
-      <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>
+<!--      <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>-->
+      <el-tooltip class="item" effect="dark" content="查看历史订单及财务数据" placement="bottom-end">
+        <a href="http://oldpop.jxhh.com/" style="color:red;font-size:14px;">查看历史数据</a>
+      </el-tooltip>
     </div>
     <div class="right-menu">
      <!-- <template v-if="device!=='mobile'">

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/platformlogin.vue

@@ -13,6 +13,7 @@
       gotosso() {
         var ticket = this.$route.query.ticket;
         this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
+          debugger
           if (res.token != "") {
             // 获取客户是否有审核信息
             getShopInf().then(res => {

src/views/system/asset/withdraw/index.vue

@@ -36,10 +36,10 @@
           <p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
         </el-form-item>
 
-        <el-form-item label="支付密码：" prop="pay_pass">
+        <el-form-item label="提现密码：" prop="pay_pass">
           <el-input v-model="assetForm.pay_pass" type="password" placeholder="请输入提现密码" style="width:420px;"/>
           <span class="withdraw-tip">
-            忘记支付密码？<span class="spe-span-a" @click="goToSetting">重新设定</span>
+            忘记提现密码？<span class="spe-span-a" @click="goToSetting">重新设定</span>
           </span>
         </el-form-item>
 
@@ -56,7 +56,7 @@
 
       <div class="footer-btn">
         <el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
-<!--        <el-button @click="resetAssetForm">取 消</el-button>-->
+        <!--        <el-button @click="resetAssetForm">取 消</el-button>-->
       </div>
     </el-card>
   </div>
@@ -89,7 +89,7 @@
         rules: {
           bank_id: [{required: true, message: "请选择要提现的银行卡", trigger: "change"}],
           code: [{required: true, message: "短信验证码不能为空", trigger: "blur"}],
-          pay_pass: [{required: true, message: "支付密码必须填写", trigger: "blur"}]
+          pay_pass: [{required: true, message: "提现密码必须填写", trigger: "blur"}]
         },
       };
     },

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">
@@ -110,7 +109,7 @@
           is_default: null,
           charge_type: null,
           dispatching: null,
-          disdispatching: null,
+          dis_dispatching: null,
           publish: null,
           created: null,
           modified: null,
@@ -159,7 +158,7 @@
         return publish
       },
       formatType(row) {
-        var typese = row.chargeType
+        var typese = row.charge_type
         var optDess = ''
         if (typese == 1) {
           optDess = "按重量"
@@ -213,7 +212,7 @@
           is_default: null,
           charge_type: null,
           dispatching: null,
-          disdispatching: null,
+          dis_dispatching: null,
           publish: null,
           created: null,
           modified: null
@@ -248,8 +247,8 @@
           id: 0,
           sort: 0,
           name: "",
-          isDefault: 0,
-          chargeType: 0,
+          is_default: 0,
+          charge_type: 0,
           dispatching: [
             {
               a: "全国",
@@ -259,7 +258,7 @@
               np: 5,
             }
           ],
-          disDispatching: "",
+          dis_dispatching: "",
           publish: 0,
         };
         this.title = "添加运费模板";

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

@@ -219,14 +219,21 @@ export default {
   },
   methods: {
     btndisabled(){
+      //debugger
       let checkListString = '';
-      if(this.btnindex == 99){
+      if (this.btnindex == 99) {
         checkListString = this.checkList.join();
-        if(checkListString.substr(0,1) === ',') {
+        if (checkListString.substr(0, 1) === ',') {
           checkListString = checkListString.slice(1);
         }
         this.goodsDate.dis_dispatching = checkListString;
-      }else{
+      } else {
+        for(let i = 0; i < this.checkList.length; i++) {
+          if(this.checkList[i] == '') {
+            this.checkList.splice(i,1)
+            i--
+          }
+        }
         this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
       }
       this.dialogVisible = false
@@ -237,27 +244,34 @@ export default {
       })
 
     },
+    /** 选择 配送区域*/
     opendias(type, i, index) {
+      //debugger
 
       this.goodsDate.dispatching.forEach((element) => {
+        if(element.a && element.a != '') {
           let arrd = element.a.split(',')
-        for(let i=0;i<arrd.length;i++){
+          for (let i = 0; i < arrd.length; i++) {
             this.disabledate.push(arrd[i]);
           }
+        }
       });
+
       let arr = this.goodsDate.dis_dispatching.split(',');
-      for(let i=0;i<arr.length;i++){
+      for (let i = 0; i < arr.length; i++) {
         this.disabledate.push(arr[i]);
       }
+
+
       this.btnindex = index;
-      this.arrlist.forEach(item =>{
+      this.arrlist.forEach(item => {
         item.value = false;
       })
       this.checkList = type.split(",");
 
       let disabledates = JSON.parse(JSON.stringify(this.disabledate)); //可以将json对象转换成json对符串
-      let disabarr = this.unique(disabledates,this.checkList) //去掉当前选择的disabled效果
-      this.arrlist.forEach(item =>{
+      let disabarr = this.unique(disabledates, this.checkList) //去掉当前选择的disabled效果
+      this.arrlist.forEach(item => {
         if (disabarr.includes(item.lable)) {
           item.value = true
         }
@@ -267,6 +281,25 @@ export default {
     },
     /** 运费模板 修改/新增 的保存  */
     handleinfomationclick() {
+      let isGone = true;
+      if( this.goodsDate.name == '' || !this.goodsDate.name.trim() ) {
+        this.$message({type:'warning',message:'模板名称不能为空,且不能包含特殊字符，请重新命名'});
+        return;
+      }
+
+      if(this.goodsDate.dispatching.length && this.goodsDate.dispatching.length > 0) {
+        for(let i = 0; i < this.goodsDate.dispatching.length;i++) {
+          if(this.goodsDate.dispatching[i].a == '') {
+            isGone = false
+            break;
+          }
+        }
+
+        if(!isGone) {
+          this.$message({type:'warning',message: '配送区域不能为空'});
+          return;
+        }
+      }
 
       this.goodsDate.dispatching.forEach(item=>{
         item.fp= Number(item.fp*100);

src/views/system/goods/add/components/goodsinfomation.vue

@@ -179,8 +179,8 @@
             {required: true, message: '请输入商品名称', trigger: 'blur'},
             {min: 3, max: 30, message: '商品标题限制在3字符以上，30个字符以下', trigger: 'blur'}
           ],
-          goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
-          producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}],
+          // goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
+          // producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}],
           deliver_area: [{required: true, message: '请选择商品发货地', trigger: 'change'}],
           unit: [{required: true, message: '商品单位不能为空', trigger: 'blur'}],
           goods_brand: [{required: true, message: '请选择商品品牌', trigger: 'change'}],

src/views/system/goods/add/index.vue

@@ -42,9 +42,9 @@
         <div class="floor-item">
           <div class="floor-item-box">
             <p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品售价</p>
-<!--            <keep-alive>-->
+            <!--            <keep-alive>-->
             <GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
-<!--            </keep-alive>-->
+            <!--            </keep-alive>-->
           </div>
         </div>
         <!-- 商品详情 -->
@@ -179,12 +179,11 @@
               unit: res.data.unit,             // 单位
               goods_brand: res.data.goods_brand,      // 品牌
               web_url: res.data.web_url,          // 外部链接
-              out_goods_id: res.data.out_goods_id,     // 商品编码
+              out_goods_id: (res.data.out_goods_id == 0) ? '' : res.data.out_goods_id ,     // 商品编码
               imgs: res.data.imgs              // 商品图片
             }
             this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;
-            // 产地 和 发货地 需要 处理
-            //this.goodsinfodata.producing_area = this.goodsinfodata.producing_area === 0 ? '' : this.goodsinfodata.producing_area;
+            // 发货地 需要 处理
             this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
 
             let arr = [];
@@ -244,16 +243,24 @@
             this.goodsaftersale.aftersale_time = res.data.aftersale_time;
             let stagArr = [];
 
+            // 后台返回数据格式 ‘2,3’或者‘[]’都是字符串，处理兼容一下
+            //debugger
             if( res.data.stags && !Array.isArray(res.data.stags)) {
               if( res.data.stags.indexOf(',') > -1 ) {
                 stagArr = res.data.stags.split(',');
                 stagArr.forEach(item => {
                   if (item) {
+                    if(Number(item)) {
                       this.goodsaftersale.stags.push(Number(item));
                     }
+                  }
                 })
               }else {
+                if(Number(res.data.stags)) {
                   this.goodsaftersale.stags.push( Number(res.data.stags) )
+                }else {
+                  this.goodsaftersale.stags = [];
+                }
               }
             }else {
               this.goodsaftersale.stags = [];
@@ -718,7 +725,11 @@
           }
         }, timer.times)
       },
-    } // methods end
+    }, // methods end
+    destroyed() {
+      clearInterval(this.TIMER);
+      this.TIMER = null;
+    } // destroyed end
   }
 </script>
 

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) {
@@ -497,10 +496,12 @@ export default {
 
       // 批量 补单发货
       if (this.goShippingNum === 2 ) {
+        debugger
         let listObj = { list: [] }
         this.goods_ids.forEach((item,index)=> {
           item['express_name'] = expressName;
-          item['express_sn'] = this.express_sn
+          item['express_sn'] = this.express_sn;
+          item['express_code'] = this.expressNum;
         })
         listObj.list = this.goods_ids;
 
@@ -545,11 +546,13 @@ export default {
         let orderObj = {
           id: 0,
           express_name: '',
-          express_sn: ''
+          express_sn: '',
+          express_code: '',
         }
 
         orderObj.id = this.goods_ids;
         orderObj.express_name = expressName;
+        orderObj.express_code = this.expressNum;
         orderObj.express_sn = this.express_sn;
 
         singleOrderObj.list.push(orderObj);
@@ -578,7 +581,6 @@ export default {
     },
     /** 修改 买家信息 */
     modifyinfo() {
-     // console.log(580,this.orderDetail);
       this.addressForm = {
         shipping_name: '',
         tel: '',
@@ -587,6 +589,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 +604,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 +674,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 +808,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 +839,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/order/index.vue

@@ -11,15 +11,26 @@
             <div slot="label">已发货{{'（' + total2 + '）' }}</div>
           </el-tab-pane>
           <el-tab-pane label="已完成" name="third"></el-tab-pane>
-          <el-tab-pane label="全部订单" name="fourth"></el-tab-pane>
+          <el-tab-pane label="全部订单" name="fourth" ></el-tab-pane>
         </el-tabs>
-        <div v-show="activeName == 'first' " style="position: absolute; top: -5px; right: 0;">
+        <div v-show="activeName == 'first' " style="position: absolute; top: -2px; right: 0;">
+          <el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
+            <el-button size="small" @click="gotoOldShop">查看老订单</el-button>
+          </el-tooltip>
           <el-button size="mini" type="primary" icon="el-icon-download" @click="handleExportUnSendOrder">导出订单</el-button>
           <el-button size="mini" icon="el-icon-position" @click="handleExportDeliveryOrder">批量发货</el-button>
         </div>
-        <div v-show="activeName == 'fourth' " style="position: absolute; top: -5px; right: 0;">
+        <div v-show="activeName == 'fourth' " style="position: absolute; top: -2px; right: 0;">
+          <el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
+            <el-button size="small" @click="gotoOldShop">查看老订单</el-button>
+          </el-tooltip>
           <el-button size="mini" type="primary" icon="el-icon-download" @click="handleAllOrderExport">导出订单</el-button>
         </div>
+        <div v-show="activeName == 'second' || activeName == 'third'" style="position: absolute; top: -2px; right: 0;">
+          <el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
+            <el-button size="small" @click="gotoOldShop">查看老订单</el-button>
+          </el-tooltip>
+        </div>
       </div>
       <div class="form-box">
         <el-form class="form-params" ref="form" :model="form" label-width="85px">
@@ -310,6 +321,10 @@
       this.getExpressList()
     },
     methods: {
+      /** 查看老订单 */
+      gotoOldShop() {
+        window.location.href = 'http://oldpop.jxhh.com/'
+      },
       checkSelectable( row,index) {
 
       },
@@ -391,6 +406,9 @@
           case 'fourth':
             this.goodsStatus = 0
             break
+          // case 'oldVersion':
+          //   window.open('http://oldpop.jxhh.com/')
+          //   break
           default:
             break
         }

src/views/system/retreat/edit.vue

@@ -88,12 +88,41 @@
           </el-row>
         </div>
       </div>
+      <!-- 买家退货凭证 -->
+      <div v-if="asOrderType == 2">
+        <div class="card-header-title">
+          <span class="blue-block blue-block-goods-title"></span>买家退货凭证
+        </div>
+        <el-table :data="returnInfoTableData" :key="1">
+          <el-table-column label="物流单号" align="center" prop="express_sn"></el-table-column>
+          <el-table-column label="物流公司" align="center" prop="express_company_name"></el-table-column>
+          <el-table-column label="物流凭证" align="center">
+            <template slot-scope="scope">
+              <div v-if="scope.row.imgs">
+                <el-image
+                  style="width: 70px; height: 70px;border:1px solid #eee;margin-right:10px;"
+                  v-for="(itemSrc,index) in returnInofImgList(scope.row.imgs)"
+                  :src="itemSrc"
+                  :preview-src-list="returnInofImgList(scope.row.imgs)">
+                </el-image>
+              </div>
+              <p v-else style="color:#666">-</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.description ? scope.row.description : '-' }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
       <!-- 历史售后申请 -->
       <div>
         <div class="card-header-title">
           <span class="blue-block blue-block-goods-title"></span>历史售后申请
         </div>
-        <el-table :data="asApplyList">
+        <el-table :data="asApplyList" :key="2">
           <el-table-column label="申请时间" align="center" prop="created_time">
             <template slot-scope="scope">
               {{formatter(scope.row.created_time)}}
@@ -254,6 +283,10 @@
         // 售后申请 图片 list
         asSrcList: [],
         asApplyList: [],
+        // 退款凭证
+        returnInfoTableData: [],
+        // 退款凭证 图片
+        // returnInofImgList: [],
         // 0-全部隐藏-默认状态; 1-显示 仅退款 按钮；2-显示 退货退款中（同意/拒绝 退货退款）按钮; 3-显示 退货退款中 （拒收包裹 / 确定退款） 按钮
         onlyOrRefundBtnType: 0,
         // 1-仅退款 同意退款; 2-仅退款 拒绝退款; 3-退货退款 同意退款退款; 4-; 5-
@@ -290,6 +323,13 @@
 
     },
     methods: {
+      returnInofImgList(imgsStr) {
+        let imgList = [];
+        if(imgsStr) {
+          imgList = imgsStr.split(',')
+        }
+        return imgList
+      },
       /** Only 代表 仅退款
        *  售后步骤和对应文案提示,
        *  在售后订单详情 查询时，需要同步调用
@@ -432,6 +472,7 @@
               // 金额处理
               this.asOrderDetail.apply_price = this.asOrderDetail.apply_price / 100
               this.asOrderDetail.price = this.asOrderDetail.price / 100
+
               // 售后图片 处理
               this.asSrcList = []
               if(this.asOrderDetail.imgs_arr && this.asOrderDetail.imgs_arr.length > 0) {
@@ -456,6 +497,17 @@
               // 商品金额 单位
               this.goodsOrderDetail.goods_price = res.data.order_goods.goods_price / 100
             }
+
+            // 退款凭证 list 数据
+            this.returnInfoTableData = [];
+            if(res.data.order_refund.return_info && res.data.order_refund.return_info.express_code) {
+              // this.returnInfoTableData.push(res.data.order_refund.return_info)
+              // console.log(494,this.returnInfoTableData);
+              this.$set(this.returnInfoTableData,this.returnInfoTableData.length,res.data.order_refund.return_info);
+            }else {
+              this.returnInfoTableData = [];
+            }
+
             // 售后历史
             if(res.data.order_refund_history) {
               this.asApplyList = res.data.order_refund_history

src/views/system/settings/setpsd.vue

@@ -24,13 +24,13 @@
           <el-divider></el-divider>
         </div>
 
-        <el-form-item label="支付密码：">
+        <el-form-item label="提现密码：">
           <el-input v-model="setForm.paypsd" :disabled="true" style="width: 300px;margin-right:20px;"></el-input>
           <el-button type="primary" icon="el-icon-edit" @click="editPay('payForm')">修改密码</el-button>
         </el-form-item>
 
         <el-form-item>
-          <p class="tipsGray">支付密码用于提现，请妥善保管您的支付密码，切勿告诉其他人，以免财产造成损失！</p>
+          <p class="tipsGray">提现密码用于提现，请妥善保管您的提现密码，切勿告诉其他人，以免财产造成损失！</p>
         </el-form-item>
       </el-form>
     </el-card>
@@ -87,8 +87,8 @@
         <el-button type="primary" @click="submitLogin('loginForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <!--修改支付密码 对话框-->
-    <el-dialog title="修改支付密码" :visible.sync="isPay" width="50%">
+    <!--修改提现密码 对话框-->
+    <el-dialog title="修改提现密码" :visible.sync="isPay" width="50%">
       <el-form :model="payForm" :rules="payRules" ref="payForm" label-width="200px" size="small">
 
         <el-form-item label="新密码：" prop="password">
@@ -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",
@@ -156,7 +156,7 @@
           callback();
         }
       };
-      // 校验 支付密码
+      // 校验 提现密码
       let checkPayPsd = (rule, value, callback) => {
         const reg = /^[0-9]{6}$/;
         if (value === '') {
@@ -227,7 +227,7 @@
     },
     mounted() {
       this.setForm.name = this.$store.state.user.name;
-      console.log(333,this.setForm.name);
+      //console.log(333,this.setForm.name);
       let repStr = this.setForm.name.substring(3,7);
       this.showMobilePlaceholder = '请输入' + this.setForm.name.replace(repStr, '****') + '的验证码';
     },
@@ -240,7 +240,7 @@
       editLogin() {
         this.isLogin = true;
       },
-      // 修改 支付密码
+      // 修改 提现密码
       editPay() {
         this.isPay = true;
       },
@@ -317,7 +317,7 @@
           }
         });
       },
-      // 修改支付密码，获取手机验证码
+      // 修改提现密码，获取手机验证码
       getPayCode() {
         let paypsdReg = /^[0-9]{6}$/;
         if (this.payForm.password === '' || !paypsdReg.test(this.payForm.password)) {
@@ -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 {
@@ -360,6 +360,7 @@
             changeTelphone(this.accountForm).then(res => {
               if(res.code === 1) {
                 this.$message({type:"success",message: '登录账号修改成功，需重新登录'});
+                this.isAccount = false;
                 // 修改成功，则强制退出，重新登录
                 this.$store.dispatch('LogOut').then(() => {
                   var ssa = window.location.host
@@ -376,7 +377,6 @@
                 this.$message({type:"error",message: msg});
               }
               this.clearAccountCodeDown();
-              this.isAccount = false;
             });
           }
         });
@@ -410,13 +410,13 @@
           }
         });
       },
-      // 支付密码 确定
+      // 提现密码 确定
       submitPay(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
             changePayPassword(this.payForm).then(res => {
               if(res.code === 1) {
-                this.$message({type:"success",message: '支付密码修改成功'});
+                this.$message({type:"success",message: '提现密码修改成功'});
                 this.clearAccountCodeDown();
                 this.isPay = false;
               }else {