1022

mobile/src/components/citySelect/index.vue

@@ -109,9 +109,9 @@ export default {
       prov: false,
       city: false,
       dist: false,
-      currentPID: idArr[0] || 18,
-      currentCID: idArr[1] || 3,
-      currentSID: idArr[2] || 2,
+      currentPID: idArr[0] !== '' ? idArr[0] : 18,
+      currentCID: idArr[1] !== '' ? idArr[1] : 3,
+      currentSID: idArr[2] !== '' ? idArr[2] : 2,
       areaPath: cloneObj(this.address.areaPath)
     }
   },
@@ -136,6 +136,8 @@ export default {
   watch: {
     currentProv () {
       this.currentCID = 0
+    },
+    currentCID () {
       this.currentSID = 0
     }
   },
@@ -171,8 +173,10 @@ export default {
           return this.$toast.show('warn', this.langAccount.fill)
         }
       }
+      params['id'] = this.address.id
+      let url = this.address.id ? 'updateAddress' : 'insertAddress'
       this.$http
-        .post('/user/updateAddress', params, {
+        .post(`/user/${url}`, params, {
           headers: {
             token: this.token
           }

mobile/src/components/citySelect/style.scss

@@ -39,7 +39,7 @@
           z-index: 999;
           transition: all 0.15s cubic-bezier(0.645, 0.045, 0.355, 1);
           overflow: auto;
-          max-height: 300px;
+          max-height: 200px;
           li{
             padding: 0 11px;
             line-height: 30px;

mobile/src/pages/account/manage/order/index.vue

@@ -55,16 +55,21 @@
               <template v-else-if="getStatus(item) === 'received'">
                 <span class="expreeNum">{{langOrders.received}}：{{item.orderItems[0].expressNum}}</span>
               </template>
+              <template v-else-if="getStatus(item) === 'expire'">
+                <span class="expreeNum">{{langOrders.expire}}</span>
+              </template>
               <template v-else>
                 <span class="expreeNum">{{langOrders.hasCancal}}</span>
               </template>
             </div>
             <div class="to-pay">
-              <span class="cancel btns" @click="changeIvoiceStatus(i,item)">{{langOrders.invoice}}</span>
-              <template v-if="getStatus(item) === 'unpaid'">
-              <span class="cancel btns" @click="cancal(item)">{{langOrders.cancal}}</span>
-              <span class="pay btns" @click="goPay(item)">{{langOrders.pay}}</span>
-            </template>
+              <template v-if="getStatus(item) !== 'expire'">
+                <span class="cancel btns" @click="changeIvoiceStatus(i,item)">{{langOrders.invoice}}</span>
+                <template v-if="getStatus(item) === 'unpaid'">
+                  <span class="cancel btns" @click="cancal(item)">{{langOrders.cancal}}</span>
+                  <span class="pay btns" @click="goPay(item)">{{langOrders.pay}}</span>
+                </template>
+              </template>
             </div>
           </div>
         </div>
@@ -270,7 +275,9 @@ export default {
         case 'processed':
           sPay()
           break
-
+        case 'expire':
+          temp = 'expire'
+          break
         default:
           break
       }

mobile/src/pages/layout/footer.vue

@@ -22,6 +22,7 @@
         <div class="copyright">
           <p>{{langFooter.copyright[0]}}</p>
           <p>{{langFooter.copyright[1]}}</p>
+          <p>珠海市四维时代网络科技有限公司</p>
         </div>
       </div>
     </div>

mobile/src/store/language/cn/manage.js

@@ -172,6 +172,7 @@ export default{
     received: '已收货',
     partShipped: '部分发货',
     hasCancal: '已取消',
+    expire: '已失效',
     edit: '修改',
     editInfo: '发货后7天内可修改',
     dontneed: '发票类型：不需要发票',

mobile/src/store/language/en/manage.js

@@ -174,6 +174,7 @@ export default{
     partShipped: 'Partly dispatched',
     received: 'Received',
     hasCancal: 'Cancelled',
+    expire: 'Expired',
     edit: 'Edit',
     editInfo: 'Only within 7 days after delivery',
     dontneed: 'Invoice type: No invoice required',

pc/src/components/citySelect/index.vue

@@ -63,6 +63,8 @@ export default {
   watch: {
     currentProv () {
       this.currentCID = 0
+    },
+    currentCID () {
       this.currentSID = 0
     }
   },

pc/src/page/layout/aside/temp/ctemp/detail.vue

@@ -399,10 +399,12 @@ export default {
         province,
         city,
         shipMobile,
-        shipName
+        shipName,
+        id: this.address.id
       }
+      let url = this.address.id ? 'updateAddress' : 'insertAddress'
       this.$http
-        .post('/user/updateAddress', params, {
+        .post(`/user/${url}`, params, {
           headers: {
             token: this.token
           }

pc/src/page/layout/aside/temp/ltemp/style.scss

@@ -53,6 +53,7 @@ $lincolor:#d0d0d1;
   cursor: pointer;
   position: relative;
   top: -10px;
+  display: inline-block;
   &:hover{
     color: #1fe4dc;
   }

pc/src/page/layout/footer.vue

@@ -39,6 +39,7 @@
         </div>
         <p>Copyright © 2020 4DAGE Co., Ltd. All rights reserved. </p>
         <p><a class="a_class" href="http://www.beian.miit.gov.cn" target="_blank">粤ICP备14078495号-3</a></p>
+        <p>珠海市四维时代网络科技有限公司</p>
       </div>
     </div>
   </div>

pc/src/page/manage/temp/information.vue

@@ -378,10 +378,12 @@ export default {
         province,
         city,
         shipMobile,
-        shipName
+        shipName,
+        id: this.address.id
       }
+      let url = this.address.id ? 'updateAddress' : 'insertAddress'
       this.$http
-        .post('/user/updateAddress', params, {
+        .post(`/user/${url}`, params, {
           headers: {
             token: this.token
           }

pc/src/page/manage/temp/order.vue

@@ -53,16 +53,20 @@
             <template v-else-if="getStatus(item) === 'received'">
               <span class="expreeNum">{{langOrders.received}}：{{item.orderItems[0].expressNum}}</span>
             </template>
-
+            <template v-else-if="getStatus(item) === 'expire'">
+              <span class="expreeNum">{{langOrders.expire}}</span>
+            </template>
             <template v-else>
               <span class="expreeNum">{{langOrders.hasCancal}}</span>
             </template>
           </div>
           <div class="to-pay">
-            <span class="cancel btns" @click="changeIvoiceStatus(i,item)">{{langOrders.invoice}}</span>
-            <template v-if="getStatus(item) === 'unpaid'">
-              <span class="cancel btns" @click="cancal(item)">{{langOrders.cancal}}</span>
-              <span class="pay btns" @click="toPay(item)">{{langOrders.pay}}</span>
+            <template v-if="getStatus(item) !== 'expire'">
+              <span class="cancel btns" @click="changeIvoiceStatus(i,item)">{{langOrders.invoice}}</span>
+              <template v-if="getStatus(item) === 'unpaid'">
+                <span class="cancel btns" @click="cancal(item)">{{langOrders.cancal}}</span>
+                <span class="pay btns" @click="toPay(item)">{{langOrders.pay}}</span>
+              </template>
             </template>
           </div>
         </div>
@@ -252,7 +256,9 @@ export default {
         case 'processed':
           sPay()
           break
-
+        case 'expire':
+          temp = 'expire'
+          break
         default:
           break
       }

pc/src/store/language/cn/manage.js

@@ -166,6 +166,7 @@ export default{
     partShipped: '部分发货',
     received: '已收货',
     hasCancal: '已取消',
+    expire: '已失效',
     edit: '修改（发货后7天内可修改）',
     dontneed: '发票类型：不需要发票',
     type1: '不需要发票',

pc/src/store/language/en/manage.js

@@ -167,6 +167,7 @@ export default{
     partShipped: 'Partly dispatched',
     received: 'Received',
     hasCancal: 'Cancelled',
+    expire: 'Expired',
     edit: 'Edit (Only within 7 days after delivery)',
     dontneed: 'Invoice type: No invoice required',
     type1: 'No invoice required',