修改包裹，修改订单

pageC/myPackage/myPackage.vue

@@ -83,6 +83,7 @@ export default {
     this.getPackageList(1);
   },
   onShow() {
+    this.page = 1;
     this.getPackageList(1);
     this.getNum();
   },

pageC/orderForm/component/orderInofrmation.vue

@@ -17,7 +17,7 @@
       <text
         class="order-status"
         :style="itemInfo.order.status == 'closed' ? 'color:#666' : ''"
-        >{{ statusName }}</text
+        >{{ itemInfo.order.status_text }}</text
       >
     </view>
     <view

pageC/orderForm/orderForm.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-navbar @leftClick="rightClick" bgColor="#f4f4f4" >
+    <u-navbar @leftClick="rightClick" bgColor="#f4f4f4">
       <view class="tab" slot="center">
         <view
           style="
@@ -66,6 +66,13 @@
           已完成
         </view>
         <view
+          :class="{ commodity: follow == 'closed' }"
+          class="tab"
+          @click="tabSwitch('closed')"
+        >
+          已取消
+        </view>
+        <view
           :class="{ commodity: follow == 'refund' }"
           class="tab"
           @click="tabSwitch('refund')"
@@ -136,9 +143,9 @@ export default {
   methods: {
     rightClick() {
       console.log(111);
-	  uni.switchTab({
-	  	url:'/pages/mine/mine'
-	  })
+      uni.switchTab({
+        url: "/pages/mine/mine",
+      });
     },
     //切换搜索订单状态
     tabSwitch(num) {

pageC/orderFormDetail/orderFormDetail.vue

@@ -2,6 +2,18 @@
   <view class="page" @click="closeShow">
     <!-- 订单状态 -->
     <view class="title">
+      <view class="payment">{{ orderDetail.status_name }}</view>
+
+      <text class="timer" v-if="orderDetail.simplify_status == 'unpaid'"
+        >剩22小时52分自动关闭</text
+      >
+      <text
+        v-else-if="orderDetail.simplify_status == 'undifference'"
+        class="timer"
+        >商品已打包称重，等待用户补邮费</text
+      >
+    </view>
+    <!-- <view class="title">
       <view v-if="orderDetail.simplify_status == 'unpaid'">
         <view class="payment"> 等待付款 </view>
         <text class="timer">剩22小时52分自动关闭</text>
@@ -42,7 +54,7 @@
         <view class="payment">待补邮费</view>
         <text class="timer">商品已打包称重，等待用户补邮费</text>
       </view>
-    </view>
+    </view> -->
     <!-- 订单状态 -->
 
     <!-- 地址信息 -->

pageD/deliverGoods/deliverGoods.vue

@@ -79,7 +79,7 @@
       </view>
     </view>
     <view class="footer">
-      <button class="status-2">立即发货</button>
+      <button class="status-2" @click="immediateDelivery">立即发货</button>
     </view>
   </view>
 </template>
@@ -114,6 +114,10 @@ export default {
         },
       });
     },
+
+    immediateDelivery() {
+      // uni;
+    },
     //扫描条形码
     scanQrCode() {
       uni.scanCode({

pageD/homepage/homepage.vue

@@ -10,7 +10,7 @@
           <button class="btn-1">
             <u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服
           </button>
-          <button v-if="isShow" class="btn-1">
+          <button v-if="isShow != '1'" class="btn-1">
             <u-icon color="#f83224" size="14" name="plus"></u-icon>关注
           </button>
         </view>
@@ -106,15 +106,16 @@ export default {
       value: 4,
       selectTab: 0,
       iconUp: 0,
-      isShow: true, //是否可关注
+      isShow: "2", //是否可关注
       userId: "",
       userInfo: {}, //用户信息
       goodsList: [],
     };
   },
   onLoad(option) {
-    console.log(option);
-    this.isShow = JSON.parse(option.page);
+    if (option.page) {
+      this.isShow = option.page;
+    }
     this.userId = option.merchant_id;
   },
   methods: {

pageD/orderInformation/orderInformation.vue

@@ -143,7 +143,8 @@
           orderInformation.status == 'overseas_undelivered' ||
           orderInformation.status == 'overseas_delivered' ||
           orderInformation.status == 'domestic_delivered' ||
-          orderInformation.status == 'finished'
+          orderInformation.status == 'finished' ||
+          orderInformation.status == 'domestic_undelivered'
         "
       >
         <text class="_label-1">付款时间</text>
@@ -167,8 +168,11 @@
         <view class="num"> 2023-11-24 22:31 </view>
       </view>
     </view>
+
     <view class="pay">
-      <text>已付</text>
+      <text>{{
+        orderInformation.status == "group_unpaid" ? "待付" : "已付"
+      }}</text>
       <text style="color: #f83224; font-weight: 600">{{
         orderInformation.estimated_price
       }}</text>

pages/mine/mine.vue

@@ -64,7 +64,7 @@ export default {
   methods: {
     toHome() {
       uni.navigateTo({
-        url: `/pageD/homepage/homepage?page=false&merchant_id=${this.userInformation.merchant.id}`,
+        url: `/pageD/homepage/homepage?page=1&merchant_id=${this.userInformation.merchant.id}`,
       });
     },
     getUserInfo() {

unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss

@@ -1 +1 @@
-.all.data-v-0d8046d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-0d8046d5{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .allweight.data-v-0d8046d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-0d8046d5{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-0d8046d5{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-0d8046d5{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-08bbbba8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-08bbbba8{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .allweight.data-v-08bbbba8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-08bbbba8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-08bbbba8{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-08bbbba8{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

unpackage/dist/build/mp-weixin/pageA/confirm.js

@@ -1 +1 @@
-require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,t,e){"use strict";e.r(t);var u=e("ea50"),c=e("53f3");for(var i in c)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(i);e("fcd2");var a=e("828b"),f=Object(a["a"])(c["default"],u["b"],u["c"],!1,null,"25e811c0",null,!1,u["a"],void 0);t["default"]=f.exports},"29cd":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.switchTab({url:"/pages/mine/mine"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};t.default=e}).call(this,e("df3c")["default"])},"4f77":function(n,t,e){},"53f3":function(n,t,e){"use strict";e.r(t);var u=e("29cd"),c=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=c.a},ea50:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},c=[]},fcd2:function(n,t,e){"use strict";var u=e("4f77"),c=e.n(u);c.a},fdd5:function(n,t,e){"use strict";(function(n,t){var u=e("47a9");e("abeb");u(e("3240"));var c=u(e("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/confirm"],{"10a7":function(n,e,t){"use strict";t.r(e);var r=t("5e18"),u=t("53f3");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("586e");var c=t("828b"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"95fe1fe2",null,!1,r["a"],void 0);e["default"]=i.exports},"29cd":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{orderinfo:function(){n.reLaunch({url:"/pageC/orderForm/orderForm"})},toindex:function(){n.switchTab({url:"/pages/index/index"})}}};e.default=t}).call(this,t("df3c")["default"])},"53f3":function(n,e,t){"use strict";t.r(e);var r=t("29cd"),u=t.n(r);for(var a in r)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(a);e["default"]=u.a},"586e":function(n,e,t){"use strict";var r=t("a4b0"),u=t.n(r);u.a},"5e18":function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var r=function(){var n=this.$createElement;this._self._c},u=[]},a4b0:function(n,e,t){},fdd5:function(n,e,t){"use strict";(function(n,e){var r=t("47a9");t("abeb");r(t("3240"));var u=r(t("10a7"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])}},[["fdd5","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/confirm.wxml

@@ -1 +1 @@
-<view style="background:#fff;height:100vh;" class="data-v-25e811c0"><view class="u-row-center data-v-25e811c0" style="display:flex;align-items:center;flex-direction:column;"><image style="width:70rpx;height:70rpx;margin-top:152rpx;" src="/pageA/static/images/success.png" mode class="data-v-25e811c0"></image><view class="success data-v-25e811c0">{{i18n.Paymentsuccess}}</view><view class="order data-v-25e811c0">{{i18n.MyOrder}}</view><view data-event-opts="{{[['tap',[['orderinfo',['$event']]]]]}}" class="look data-v-25e811c0" bindtap="__e">{{i18n.Vieworder}}</view><view data-event-opts="{{[['tap',[['toindex',['$event']]]]]}}" class="index data-v-25e811c0" bindtap="__e">{{i18n.Backtohomepage}}</view></view></view>
+<view style="background:#fff;height:100vh;" class="data-v-95fe1fe2"><view class="u-row-center data-v-95fe1fe2" style="display:flex;align-items:center;flex-direction:column;"><image style="width:70rpx;height:70rpx;margin-top:152rpx;" src="/pageA/static/images/success.png" mode class="data-v-95fe1fe2"></image><view class="success data-v-95fe1fe2">{{i18n.Paymentsuccess}}</view><view class="order data-v-95fe1fe2">{{i18n.MyOrder}}</view><view data-event-opts="{{[['tap',[['orderinfo',['$event']]]]]}}" class="look data-v-95fe1fe2" bindtap="__e">{{i18n.Vieworder}}</view><view data-event-opts="{{[['tap',[['toindex',['$event']]]]]}}" class="index data-v-95fe1fe2" bindtap="__e">{{i18n.Backtohomepage}}</view></view></view>

unpackage/dist/build/mp-weixin/pageA/confirm.wxss

@@ -1 +1 @@
-.success.data-v-25e811c0{font-family:PingFangTC;font-weight:600;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal;margin-top:32rpx}.order.data-v-25e811c0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal;margin-top:16rpx}.look.data-v-25e811c0{width:310rpx;height:84rpx;background:#f83224;border-radius:42rpx;margin-top:100rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.index.data-v-25e811c0{width:310rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.2);margin-top:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#333;line-height:84rpx;text-align:center;font-style:normal}
+.success.data-v-95fe1fe2{font-family:PingFangTC;font-weight:600;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal;margin-top:32rpx}.order.data-v-95fe1fe2{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal;margin-top:16rpx}.look.data-v-95fe1fe2{width:310rpx;height:84rpx;background:#f83224;border-radius:42rpx;margin-top:100rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.index.data-v-95fe1fe2{width:310rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.2);margin-top:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#333;line-height:84rpx;text-align:center;font-style:normal}

unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.wxss

@@ -1 +1 @@
-.inp.data-v-83649468{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-83649468{padding:0 24rpx 50rpx}.top-tab.data-v-83649468{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-83649468{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-83649468{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-83649468::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}
+.inp.data-v-2b417e79{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-2b417e79{padding:0 24rpx 50rpx}.top-tab.data-v-2b417e79{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-2b417e79{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-2b417e79{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-2b417e79::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/screenPopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/screenPopup"],{"1f39":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-popup/u-popup")]).then(e.bind(null,"f1b1"))},"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"7780"))}},u=function(){var t=this.$createElement;this._self._c},a=[]},3700:function(t,n,e){},b6e1:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={data:function(){return{followPopup:"",selectTab:0,searchData:{keywords:"",status:"",source:"0"}}},props:{follow:{typeof:String,default:""},show:{typeof:Boolean,default:!1}},watch:{follow:function(t){this.followPopup=t}},methods:{tabSwitch:function(t){this.followPopup=t,this.searchData.status=t},close:function(){this.$emit("close")},confirm:function(){this.$emit("close",this.searchData)},selected:function(t){this.selectTab=t,this.searchData.source=t}}};n.default=o},baeb:function(t,n,e){"use strict";e.r(n);var o=e("1f39"),u=e("cda3e");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("da33");var i=e("828b"),c=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,"dda31df0",null,!1,o["a"],void 0);n["default"]=c.exports},cda3e:function(t,n,e){"use strict";e.r(n);var o=e("b6e1"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},da33:function(t,n,e){"use strict";var o=e("3700"),u=e.n(o);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/screenPopup"],{"1f39":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-popup/u-popup")]).then(e.bind(null,"f1b1"))},"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"7780"))}},u=function(){var t=this.$createElement;this._self._c},a=[]},3700:function(t,n,e){},b6e1:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={data:function(){return{followPopup:"",selectTab:0,searchData:{keywords:"",status:"",source:"0"}}},props:{follow:{typeof:String,default:""},show:{typeof:Boolean,default:!1}},watch:{follow:function(t){this.followPopup=t}},methods:{tabSwitch:function(t){this.followPopup=t,this.searchData.status=t},close:function(){this.$emit("close")},confirm:function(){this.$emit("close",this.searchData)},selected:function(t){this.selectTab=t,this.searchData.source=t}}};n.default=o},baeb:function(t,n,e){"use strict";e.r(n);var o=e("1f39"),u=e("cda3");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("da33");var i=e("828b"),c=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,"dda31df0",null,!1,o["a"],void 0);n["default"]=c.exports},cda3:function(t,n,e){"use strict";e.r(n);var o=e("b6e1"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},da33:function(t,n,e){"use strict";var o=e("3700"),u=e.n(o);u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/screenPopup-create-component',
     {

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }