css

assets/css/mine/orderdetail.scss

@@ -465,8 +465,8 @@
                 font-weight: 600;
             }
             .btn {
-                width: 160rpx;
-                height: 80rpx;
+                width: 120rpx;
+                height: 60rpx;
                 margin-right: 24rpx;
                 &:last-child {
                     margin-right: 0;

pages/mine/login.vue

 <template>
     <view class="page-login">
         <text class="iconfont icon-xxx" v-back></text>
-        <image src="../../static/logo.png" mode="aspectFill" class="logo"></image>
+        <navigator url="/"><image src="../../static/logo.png" mode="aspectFill" class="logo"></image></navigator>
         <view class="tab" :class="{ mb40: curr == 1 }">
             <text class="box" v-for="(item, index) in text_item" :key="index" :class="{ curr: index == curr }" @click="tab(index)">{{ item }}</text>
         </view>

pages/mine/orderdetail.vue

@@ -344,7 +344,7 @@
                     </view>
                     <view class="btn row bothSide verCenter">
                         <view class="btn1 row rowCenter verCenter" @click="close(1)">关闭</view>
-                        <navigator url="joincart" hover-class="none" class="btn2 row rowCenter verCenter">前往购物车</navigator>
+                        <navigator url="/joincart" hover-class="none" class="btn2 row rowCenter verCenter">前往购物车</navigator>
                     </view>
                 </template>
                 <template v-else-if="tipType == 2">
@@ -404,8 +404,12 @@ export default {
         open() {
             this.$refs.popup.open('bottom');
         },
-        close() {
-            this.$refs.popup.close();
+        close(type) {
+            if (type == 1) {
+                this.$refs.popupCenter.close();
+            } else {
+                this.$refs.popup.close();
+            }
         },
         filterChange(index) {
             this.$set(this.shipping_flag, index, (this.shipping_flag[index] = !this.shipping_flag[index]));
@@ -428,6 +432,7 @@ export default {
                         icon: 'success'
                     });
                     setTimeout(() => {
+                        this.close();
                         this.getData();
                     }, 2000);
                 } else {

pages/mine/shoporder.vue

@@ -125,7 +125,7 @@
                     </view>
                     <view class="btn row bothSide verCenter">
                         <view class="btn1 row rowCenter verCenter" @click="close(1)">关闭</view>
-                        <navigator url="joincart" hover-class="none" class="btn2 row rowCenter verCenter">前往购物车</navigator>
+                        <navigator url="/joincart" hover-class="none" class="btn2 row rowCenter verCenter">前往购物车</navigator>
                     </view>
                 </template>
                 <template v-else-if="tipType == 2">