解决冲突

pageD/orderInformation/orderInformation.vue

@@ -140,10 +140,10 @@
       <view
         class="order"
         v-if="
-          (orderInformation.status == 'overseas_undelivered' ||
-            orderInformation.status == 'overseas_delivered' ||
-            orderInformation.status == 'finished') &&
-          orderInformation.status != 'domestic_delivered'
+          orderInformation.status == 'overseas_undelivered' ||
+          orderInformation.status == 'overseas_delivered' ||
+          orderInformation.status == 'domestic_delivered' ||
+          orderInformation.status == 'finished'
         "
       >
         <text class="_label-1">付款时间</text>
@@ -167,7 +167,7 @@
         <view class="num"> 2023-11-24 22:31 </view>
       </view>
     </view>
-    <view class="pay" v-if="orderInformation.status != 'domestic_delivered'">
+    <view class="pay">
       <text>已付</text>
       <text style="color: #f83224; font-weight: 600">{{
         orderInformation.estimated_price
@@ -181,7 +181,13 @@
         orderInformation.status == 'finished'
       "
     >
-      <button class="btn-1" @click="toLogistics">删除</button>
+      <button
+        class="btn-1"
+        @click="toLogistics"
+        v-if="orderInformation.status == 'finished'"
+      >
+        删除
+      </button>
       <button class="btn-1" @click="toLogistics">查看物流</button>
       <button
         class="btn-1"
@@ -202,7 +208,8 @@
       class="footer"
       v-else-if="
         orderInformation.status == 'domestic_undelivered' ||
-        orderInformation.status == 'unpaid'
+        orderInformation.status == 'unpaid' ||
+        orderInformation.status == 'group_unpaid'
       "
     >
       <button
@@ -230,7 +237,10 @@
       <button
         class="btn-2"
         @click="toPay"
-        v-if="orderInformation.status == 'unpaid'"
+        v-if="
+          orderInformation.status == 'unpaid' ||
+          orderInformation.status == 'group_unpaid'
+        "
       >
         立即付款
       </button></view
@@ -316,7 +326,7 @@ export default {
     //去支付
     toPay() {
       uni.navigateTo({
-        url: `/pageD/paymentOrder/paymentOrder?money=${this.orderInformation.actual_price}&weight=${this.orderInformation.goods[0].actual_weight}&type=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}`,
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.orderInformation.estimated_price}&weight=${this.orderInformation.goods[0].actual_weight}&packageType=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}&type=${this.orderInformation.type}`,
       });
     },
     getDetail() {

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

@@ -1 +1 @@
-.all.data-v-13ce84d7{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-13ce84d7{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .allweight.data-v-13ce84d7{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-13ce84d7{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-13ce84d7{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-13ce84d7{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-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}

unpackage/dist/build/mp-weixin/pageB/orderinfo.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"25fa":function(n,e,t){"use strict";t.r(e);var o=t("ec86"),r=t("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);t("84ee");var u=t("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"fa7c2f78",null,!1,o["a"],void 0);e["default"]=a.exports},"84ee":function(n,e,t){"use strict";var o=t("b1b6"),r=t.n(o);r.a},"8b5a":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("df3c")["default"])},"8d8c":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var r=o(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var o=t("8b5a"),r=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=r.a},b1b6:function(n,e,t){},ec86:function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]}},[["8d8c","common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"147a":function(n,e,t){},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5abc":function(n,e,t){"use strict";var r=t("147a"),o=t.n(r);o.a},8079:function(n,e,t){"use strict";t.r(e);var r=t("9789"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("5abc");var i,a=t("f0c5"),c=Object(a["a"])(o["default"],r["b"],r["c"],!1,null,"66b183e6",null,!1,r["a"],i);e["default"]=c.exports},9789:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"235c":function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-navbar/u-navbar")]).then(e.bind(null,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]},"25fa":function(n,t,e){"use strict";e.r(t);var o=e("235c"),r=e("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("2734");var u=e("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"66b183e6",null,!1,o["a"],void 0);t["default"]=a.exports},2734:function(n,t,e){"use strict";var o=e("af40"),r=e.n(o);r.a},"8b5a":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};t.default=e}).call(this,e("df3c")["default"])},"8d8c":function(n,t,e){"use strict";(function(n,t){var o=e("47a9");e("abeb");o(e("3240"));var r=o(e("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},a9d5:function(n,t,e){"use strict";e.r(t);var o=e("8b5a"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},af40:function(n,t,e){}},[["8d8c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageB/parcel.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"48ae":function(t,n,e){"use strict";var i=e("d515"),u=e.n(i);u.a},"8edf":function(t,n,e){"use strict";e.r(n);var i=e("f57d"),u=e("9825");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("48ae");var o=e("828b"),c=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,"d50eb15e",null,!1,i["a"],void 0);n["default"]=c.exports},9443:function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var u=i(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var i=e("d786"),u=e.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);n["default"]=u.a},d515:function(t,n,e){},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})}},mounted:function(){t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])},f57d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]}},[["9443","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"023f":function(t,n,e){"use strict";var i=e("2399"),u=e.n(i);u.a},"07d5":function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},u=[]},2399:function(t,n,e){},"8edf":function(t,n,e){"use strict";e.r(n);var i=e("07d5"),u=e("9825");for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("023f");var a=e("828b"),c=Object(a["a"])(u["default"],i["b"],i["c"],!1,null,"461f5271",null,!1,i["a"],void 0);n["default"]=c.exports},9443:function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var u=i(e("8edf"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},9825:function(t,n,e){"use strict";e.r(n);var i=e("d786"),u=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=u.a},d786:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={components:{AllRight:function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("2c60"))}.bind(null,e)).catch(e.oe)}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=i}).call(this,e("df3c")["default"])}},[["9443","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-.page.data-v-d50eb15e{padding:20rpx 24rpx}.page .set-top.data-v-d50eb15e{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-d50eb15e{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-d50eb15e{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-d50eb15e{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-d50eb15e{font-size:36rpx}.page .set-top .address.data-v-d50eb15e{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-d50eb15e{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-d50eb15e{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-d50eb15e{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-d50eb15e{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-d50eb15e{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-d50eb15e{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-d50eb15e{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-d50eb15e{width:32rpx;height:32rpx}.page .text-right.data-v-d50eb15e{display:flex;align-items:center}.page .text-right text.data-v-d50eb15e{font-size:30rpx;color:rgba(34,34,34,.5)}
+.page.data-v-461f5271{padding:20rpx 24rpx}.page .set-top.data-v-461f5271{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-461f5271{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-461f5271{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-461f5271{font-size:36rpx}.page .set-top .address.data-v-461f5271{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-461f5271{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-461f5271{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-461f5271{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-461f5271{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-461f5271{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-461f5271{width:32rpx;height:32rpx}.page .text-right.data-v-461f5271{display:flex;align-items:center}.page .text-right text.data-v-461f5271{font-size:30rpx;color:rgba(34,34,34,.5)}

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

@@ -1 +1 @@
-.page.data-v-355cc9bb{padding:20rpx 24rpx}.page .content.data-v-355cc9bb{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-355cc9bb{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-355cc9bb{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-355cc9bb{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-355cc9bb{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-355cc9bb{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-355cc9bb{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-355cc9bb{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-355cc9bb{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-355cc9bb{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}
+.page.data-v-17aecd9b{padding:20rpx 24rpx}.page .content.data-v-17aecd9b{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-17aecd9b{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-17aecd9b{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-17aecd9b{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-17aecd9b{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-17aecd9b{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-17aecd9b{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-17aecd9b{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-17aecd9b{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-17aecd9b{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}

unpackage/dist/build/mp-weixin/pageC/addEditAddress/component/selectCity.wxss

@@ -1 +1 @@
-.title.data-v-7337eeca{margin:32rpx 26rpx}.inp.data-v-7337eeca{background-color:#f4f4f4;border-radius:36rpx;height:72rpx;width:694rpx;margin:30rpx auto 0;padding-left:20rpx}.city-list.data-v-7337eeca{display:flex;justify-content:space-around;flex-wrap:wrap}.city-list .city.data-v-7337eeca{width:156rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f4f4f4;border-radius:36rpx;margin-bottom:20rpx;color:#222;font-size:28rpx}.confirm.data-v-7337eeca{background-color:#f83224;border-radius:40rpx;color:#fff;width:702rpx;margin:0 auto}.picker-view.data-v-7337eeca{width:100%;height:180px;margin-top:10px}.item.data-v-7337eeca{height:50px}.text.data-v-7337eeca{line-height:50px;text-align:center}.picker-view-column.data-v-7337eeca{text-align:center}
+.title.data-v-0f0c6476{margin:32rpx 26rpx}.inp.data-v-0f0c6476{background-color:#f4f4f4;border-radius:36rpx;height:72rpx;width:694rpx;margin:30rpx auto 0;padding-left:20rpx}.city-list.data-v-0f0c6476{display:flex;justify-content:space-around;flex-wrap:wrap}.city-list .city.data-v-0f0c6476{width:156rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f4f4f4;border-radius:36rpx;margin-bottom:20rpx;color:#222;font-size:28rpx}.confirm.data-v-0f0c6476{background-color:#f83224;border-radius:40rpx;color:#fff;width:702rpx;margin:0 auto}.picker-view.data-v-0f0c6476{width:100%;height:180px;margin-top:10px}.item.data-v-0f0c6476{height:50px}.text.data-v-0f0c6476{line-height:50px;text-align:center}.picker-view-column.data-v-0f0c6476{text-align:center}

unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.wxml

@@ -1 +1 @@
-<view class="data-v-2052f920"><view class="top-tab data-v-2052f920"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-2052f920',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-2052f920',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-2052f920"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-2052f920" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-2052f920">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-2052f920"><button class="wx data-v-2052f920">{{i18n.wx}}</button><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress']]]]]}}" class="add data-v-2052f920" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-2052f920"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress']]]]]}}" class="add-international data-v-2052f920" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>
+<view class="data-v-119d42a7"><view class="top-tab data-v-119d42a7"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-119d42a7',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-119d42a7',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-119d42a7"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-119d42a7" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-119d42a7">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-119d42a7"><button class="wx data-v-119d42a7">{{i18n.wx}}</button><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress']]]]]}}" class="add data-v-119d42a7" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-119d42a7"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress']]]]]}}" class="add-international data-v-119d42a7" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>

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

@@ -1 +1 @@
-.top-tab.data-v-2052f920{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-2052f920{position:relative;font-weight:600}.top-tab .select.data-v-2052f920::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-2052f920{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-2052f920{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-2052f920{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-2052f920{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-2052f920{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-2052f920{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}
+.top-tab.data-v-119d42a7{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-119d42a7{position:relative;font-weight:600}.top-tab .select.data-v-119d42a7::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-119d42a7{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-119d42a7{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-119d42a7{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-119d42a7{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-119d42a7{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-119d42a7{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}

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

@@ -1 +1 @@
-.page.data-v-4227abc6{padding:20rpx 24rpx}.page .content.data-v-4227abc6{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-4227abc6{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-4227abc6{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-4227abc6{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-4227abc6{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-4227abc6{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-4227abc6{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-4227abc6{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-4227abc6{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-4227abc6{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}
+.page.data-v-b51c2260{padding:20rpx 24rpx}.page .content.data-v-b51c2260{background-color:#fff;border-radius:16rpx;padding:0 24rpx}.page .content .title.data-v-b51c2260{display:flex;justify-content:space-between;align-items:center;height:100rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .content .title .title-left.data-v-b51c2260{font-size:32rpx;color:#333;font-weight:600}.page .content .title .title-icon.data-v-b51c2260{width:26rpx;height:26rpx;margin-right:10rpx}.page .content .title .title-right.data-v-b51c2260{display:flex;align-items:center;font-size:24rpx;color:rgba(51,51,51,.6)}.page .content .company.data-v-b51c2260{height:102rpx;display:flex;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .item-left.data-v-b51c2260{font-size:24rpx;color:#333;display:flex;align-items:center;height:86rpx}.page .item-left .address-icon.data-v-b51c2260{width:26rpx;height:26rpx;margin-right:10rpx}.page .footer.data-v-b51c2260{background-color:#fff;position:fixed;bottom:0;height:146rpx;width:750rpx;left:0;padding-top:20rpx}.page .footer .save.data-v-b51c2260{width:702rpx;margin:0 auto;background-color:#f83224;color:#fff;border-radius:40rpx}

unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxml

@@ -1 +1 @@
-<view class="data-v-27ba534d"><view class="top-search data-v-27ba534d"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-27ba534d" bind:__l="__l"></u--input><view class="top-tab data-v-27ba534d"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-27ba534d',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-27ba534d',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-27ba534d',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-27ba534d',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-27ba534d"><view class="prompt data-v-27ba534d"><image class="prompt-icon data-v-27ba534d" src="../../static/mine/336.png" mode></image>{{'当前页面加载的订单总重量'+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-27ba534d"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-27ba534d" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-982272d2"><view class="top-search data-v-982272d2"><u--input bind:input="__e" vue-id="ac2da40c-1" placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" class="data-v-982272d2" bind:__l="__l"></u--input><view class="top-tab data-v-982272d2"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-982272d2',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{'发往中转点'+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-982272d2',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{'中转已签收 '+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-982272d2',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{'正发往海外 '+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-982272d2',(follow=='other')?'commodity':'']}}" bindtap="__e">{{'其他 '+statusNum.other+''}}</view></view></view><view class="content data-v-982272d2"><view class="prompt data-v-982272d2"><image class="prompt-icon data-v-982272d2" src="../../static/mine/336.png" mode></image>{{'当前页面加载的订单总重量'+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-982272d2"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-982272d2" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -1 +1 @@
-.top-search.data-v-27ba534d{background-color:#fff;padding:20rpx 24rpx}.data-v-27ba534d .u-input{background-color:#f4f4f4}.top-tab.data-v-27ba534d{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-27ba534d{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-27ba534d{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-27ba534d::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-27ba534d{padding:20rpx 24rpx}.content .prompt.data-v-27ba534d{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-27ba534d{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-982272d2{background-color:#fff;padding:20rpx 24rpx}.data-v-982272d2 .u-input{background-color:#f4f4f4}.top-tab.data-v-982272d2{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-982272d2{margin-right:40rpx;font-size:26rpx;color:#555;flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;font-size:32rpx}.top-tab .commodity.data-v-982272d2{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-982272d2::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-982272d2{padding:20rpx 24rpx}.content .prompt.data-v-982272d2{background-color:#fbe8e6;border-radius:10rpx;padding:16rpx 22rpx;font-size:24rpx;display:flex;align-items:center;color:#f83224}.content .prompt .prompt-icon.data-v-982272d2{width:36rpx;height:36rpx;margin-right:20rpx}

unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"467d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},"9cbe":function(t,n,e){"use strict";var r=e("a0fe"),f=e.n(r);f.a},a0fe:function(t,n,e){},bf43:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){}));var r=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),f=n.amount.split("."),u=n.amount.split(".");return{$orig:r,g0:f,g1:u}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},f=[]},efd1:function(t,n,e){"use strict";e.r(n);var r=e("bf43"),f=e("f4f4");for(var u in f)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return f[t]}))}(u);e("9cbe");var o=e("828b"),a=Object(o["a"])(f["default"],r["b"],r["c"],!1,null,"6d7c0ee3",null,!1,r["a"],void 0);n["default"]=a.exports},f4f4:function(t,n,e){"use strict";e.r(n);var r=e("467d"),f=e.n(r);for(var u in r)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(u);n["default"]=f.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"467d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},a589:function(t,n,e){"use strict";var r=e("e64a"),u=e.n(r);u.a},e64a:function(t,n,e){},ee40:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var r=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),u=n.amount.split("."),o=n.amount.split(".");return{$orig:r,g0:u,g1:o}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},u=[]},efd1:function(t,n,e){"use strict";e.r(n);var r=e("ee40"),u=e("f4f4");for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("a589");var a=e("828b"),f=Object(a["a"])(u["default"],r["b"],r["c"],!1,null,"00027f04",null,!1,r["a"],void 0);n["default"]=f.exports},f4f4:function(t,n,e){"use strict";e.r(n);var r=e("467d"),u=e.n(r);for(var o in r)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(o);n["default"]=u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

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

@@ -3,6 +3,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
+    "u--input": "/uview-ui/components/u--input/u--input",
     "order-inofrmation": "/pageC/orderForm/component/orderInofrmation",
     "refund-card": "/pageC/orderForm/component/refundCard",
     "agree-popup": "/pageC/mineComponent/agreePopup"

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

@@ -1 +1 @@
-.inp.data-v-e9fe08d4{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-e9fe08d4{padding:0 24rpx 50rpx}.top-tab.data-v-e9fe08d4{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-e9fe08d4{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-e9fe08d4{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-e9fe08d4::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}
+.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}

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/moneyDestination.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/moneyDestination"],{"127e":function(e,n,t){"use strict";t.r(n);var u=t("3d91"),o=t("4bf5");for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);t("72e6");var r=t("828b"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"4ee4b1a3",null,!1,u["a"],void 0);n["default"]=a.exports},"27c8":function(e,n,t){},"3d91":function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return i})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))},uSteps:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps/u-steps")]).then(t.bind(null,"ef97"))},uStepsItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps-item/u-steps-item")]).then(t.bind(null,"0358"))}},o=function(){var e=this.$createElement,n=(this._self._c,this.refundDetail.goods[0].refund.refund_price.split(".")),t=this.refundDetail.goods[0].refund.refund_price.split(".");this.$mp.data=Object.assign({},{$root:{g0:n,g1:t}})},i=[]},"4bf5":function(e,n,t){"use strict";t.r(n);var u=t("661a"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);n["default"]=o.a},"661a":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1},refundDetail:{typeof:Object,default:function(){return{}}}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(e){console.log(this.value),this.$emit("close",e)}}};n.default=u},"72e6":function(e,n,t){"use strict";var u=t("27c8"),o=t.n(u);o.a}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/moneyDestination"],{"08ba":function(e,n,t){"use strict";var u=t("3dd8"),o=t.n(u);o.a},"3dd8":function(e,n,t){},"443f":function(e,n,t){"use strict";t.r(n);var u=t("87e1"),o=t("9a0e");for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);t("08ba");var r,a=t("f0c5"),f=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"4ee4b1a3",null,!1,u["a"],r);n["default"]=f.exports},"87e1":function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return i})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},uSteps:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps/u-steps")]).then(t.bind(null,"e946"))},uStepsItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps-item/u-steps-item")]).then(t.bind(null,"f082"))}},o=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.refund_price.split(".")),u=e.refundDetail.goods[0].refund.refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:u}})},i=[]},"8a45":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1},refundDetail:{typeof:Object,default:function(){return{}}}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(e){console.log(this.value),this.$emit("close",e)}}};n.default=u},"9a0e":function(e,n,t){"use strict";t.r(n);var u=t("8a45"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);n["default"]=o.a}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/moneyDestination-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundInProgress.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{"03b2":function(n,t,e){"use strict";e.r(t);var u=e("c44c"),r=e("0686");for(var f in r)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("7a55");var i=e("828b"),a=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,"4b1ecb2f",null,!1,u["a"],void 0);t["default"]=a.exports},"0686":function(n,t,e){"use strict";e.r(t);var u=e("683d"),r=e.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);t["default"]=r.a},"683d":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"7a55":function(n,t,e){"use strict";var u=e("f5da"),r=e.n(u);r.a},c44c:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement,t=(this._self._c,this.refundDetail.goods.length),e=t>0?this.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?this.refundDetail.goods[0].refund.refund_price.split("."):null;this.$mp.data=Object.assign({},{$root:{g0:t,g1:e,g2:u}})},r=[]},f5da:function(n,t,e){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{"28ed":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=r},"694d":function(e,n,t){"use strict";t.r(n);var r=t("8461"),u=t("6da1");for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);t("8c6e");var a,o=t("f0c5"),c=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"4b1ecb2f",null,!1,r["a"],a);n["default"]=c.exports},"6da1":function(e,n,t){"use strict";t.r(n);var r=t("28ed"),u=t.n(r);for(var f in r)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(f);n["default"]=u.a},"6e11":function(e,n,t){},8461:function(e,n,t){"use strict";var r;t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return f})),t.d(n,"a",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods.length),r=t>0?e.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?e.refundDetail.goods[0].refund.refund_price.split("."):null;e.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},f=[]},"8c6e":function(e,n,t){"use strict";var r=t("6e11"),u=t.n(r);u.a}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundInProgress-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"606b":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"692a":function(n,t,e){"use strict";e.r(t);var u=e("606b"),r=e.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);t["default"]=r.a},"85de":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},r=[]},8921:function(n,t,e){"use strict";e.r(t);var u=e("85de"),r=e("692a");for(var f in r)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("e1b2");var a=e("828b"),c=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,"2a04f148",null,!1,u["a"],void 0);t["default"]=c.exports},bb57:function(n,t,e){},e1b2:function(n,t,e){"use strict";var u=e("bb57"),r=e.n(u);r.a}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"137c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"2fc8":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return f})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var f=function(){var n=this,t=n.$createElement;n._self._c},r=[]},"64e6":function(n,t,e){"use strict";e.r(t);var u=e("137c"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=f.a},9728:function(n,t,e){"use strict";e.r(t);var u=e("2fc8"),f=e("64e6");for(var r in f)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return f[n]}))}(r);e("ba35");var c,a=e("f0c5"),i=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"2a04f148",null,!1,u["a"],c);t["default"]=i.exports},ba35:function(n,t,e){"use strict";var u=e("f85d"),f=e.n(u);f.a},f85d:function(n,t,e){}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"606b":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"692a":function(e,t,n){"use strict";n.r(t);var u=n("606b"),r=n.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){n.d(t,e,(function(){return u[e]}))}(f);t["default"]=r.a},"6a7e":function(e,t,n){"use strict";n.d(t,"b",(function(){return u})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){}));var u=function(){var e=this.$createElement,t=(this._self._c,this.refundDetail.goods[0].refund.refund_price.split(".")),n=this.refundDetail.goods[0].refund.refund_price.split("."),u=this.refundDetail.goods[0].refund.refund_price.split("."),r=this.refundDetail.goods[0].refund.refund_price.split(".");this.$mp.data=Object.assign({},{$root:{g0:t,g1:n,g2:u,g3:r}})},r=[]},8921:function(e,t,n){"use strict";n.r(t);var u=n("6a7e"),r=n("692a");for(var f in r)["default"].indexOf(f)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(f);n("aefd");var i=n("828b"),a=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,"bf5ef4f0",null,!1,u["a"],void 0);t["default"]=a.exports},aefd:function(e,t,n){"use strict";var u=n("bc10"),r=n.n(u);r.a},bc10:function(e,t,n){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundSuccessful-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.wxml

@@ -1 +1 @@
-<view class="top-direction data-v-2a04f148"><view class="direction-frist data-v-2a04f148"><view class="data-v-2a04f148">退款成功</view><view class="commodity-price data-v-2a04f148"><text style="font-size:20rpx;" class="data-v-2a04f148">￥</text><text class="data-v-2a04f148">133</text>.<text style="font-size:20rpx;" class="data-v-2a04f148">22</text></view></view><view class="time data-v-2a04f148">2023年12月4号 18:23</view><view class="direction-last data-v-2a04f148"><view class="data-v-2a04f148">退款余额</view><view class="commodity-price data-v-2a04f148"><text style="font-size:20rpx;" class="data-v-2a04f148">￥</text><text class="data-v-2a04f148">133</text>.<text style="font-size:20rpx;" class="data-v-2a04f148">22</text></view></view><button data-event-opts="{{[['tap',[['$emit',['checkMoney']]]]]}}" class="check data-v-2a04f148" bindtap="__e">查看钱款去向</button></view>
+<view class="top-direction data-v-bf5ef4f0"><view class="direction-frist data-v-bf5ef4f0"><view class="data-v-bf5ef4f0">退款成功</view><view class="commodity-price data-v-bf5ef4f0"><text style="font-size:20rpx;" class="data-v-bf5ef4f0">￥</text><text class="data-v-bf5ef4f0">{{$root.g0[0]}}</text>.<text style="font-size:20rpx;" class="data-v-bf5ef4f0">{{$root.g1[1]}}</text></view></view><view class="time data-v-bf5ef4f0">2023年12月4号 18:23</view><view class="direction-last data-v-bf5ef4f0"><view class="data-v-bf5ef4f0">退款余额</view><view class="commodity-price data-v-bf5ef4f0"><text style="font-size:20rpx;" class="data-v-bf5ef4f0">￥</text><text class="data-v-bf5ef4f0">{{$root.g2[0]}}</text>.<text style="font-size:20rpx;" class="data-v-bf5ef4f0">{{$root.g3[1]}}</text></view></view><button data-event-opts="{{[['tap',[['$emit',['checkMoney']]]]]}}" class="check data-v-bf5ef4f0" bindtap="__e">查看钱款去向</button></view>

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.wxss

@@ -1 +1 @@
-.top-direction.data-v-2a04f148{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-2a04f148{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-2a04f148{color:#f83224}.top-direction .time.data-v-2a04f148{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-2a04f148{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-2a04f148{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}
+.top-direction.data-v-bf5ef4f0{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-bf5ef4f0{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-bf5ef4f0{color:#f83224}.top-direction .time.data-v-bf5ef4f0{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-bf5ef4f0{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-bf5ef4f0{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refusalToRefund.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{"0dc9":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},1478:function(n,t,e){"use strict";e.r(t);var u=e("0dc9"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=f.a},"59c3":function(n,t,e){"use strict";var u=e("ae92"),f=e.n(u);f.a},"9b67":function(n,t,e){"use strict";e.r(t);var u=e("bd0f"),f=e("1478");for(var r in f)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return f[n]}))}(r);e("59c3");var a=e("828b"),c=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"209e2b02",null,!1,u["a"],void 0);t["default"]=c.exports},ae92:function(n,t,e){},bd0f:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},f=[]}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{"19e1":function(n,t,e){"use strict";e.r(t);var u=e("3c56"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},"3c56":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"4d1b":function(n,t,e){"use strict";e.r(t);var u=e("a6b2"),r=e("19e1");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("83b6");var f,c=e("f0c5"),o=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"209e2b02",null,!1,u["a"],f);t["default"]=o.exports},"5a44":function(n,t,e){},"83b6":function(n,t,e){"use strict";var u=e("5a44"),r=e.n(u);r.a},a6b2:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},a=[]}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{"0dc9":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},1478:function(n,t,e){"use strict";e.r(t);var u=e("0dc9"),f=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=f.a},"29bf":function(n,t,e){"use strict";var u=e("9ba3"),f=e.n(u);f.a},"9b67":function(n,t,e){"use strict";e.r(t);var u=e("9f3f1"),f=e("1478");for(var a in f)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return f[n]}))}(a);e("29bf");var r=e("828b"),c=Object(r["a"])(f["default"],u["b"],u["c"],!1,null,"982056aa",null,!1,u["a"],void 0);t["default"]=c.exports},"9ba3":function(n,t,e){},"9f3f1":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},f=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refusalToRefund-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refusalToRefund.wxml

@@ -1 +1 @@
-<view class="data-v-209e2b02"><view class="top-direction data-v-209e2b02"><view class="direction-frist data-v-209e2b02"><view class="data-v-209e2b02">卖家拒绝了您的退款申请</view></view><view class="time data-v-209e2b02">{{''+refundDetail.goods[0].refund.reason+''}}</view><view class="time data-v-209e2b02">2023-12-08 12:45</view></view></view>
+<view class="data-v-982056aa"><block wx:if="{{refundDetail.goods[0].refund.status==2}}"><view class="top-direction data-v-982056aa"><view class="direction-frist data-v-982056aa"><view class="data-v-982056aa">卖家拒绝了您的退款申请</view></view><view class="time data-v-982056aa">{{''+refundDetail.goods[0].refund.reason+''}}</view><view class="time data-v-982056aa">2023-12-08 12:45</view></view></block><block wx:else><view class="top-direction data-v-982056aa"><view class="direction-frist data-v-982056aa"><view class="data-v-982056aa">已申请平台介入</view></view><view class="time data-v-982056aa">{{''+(refundDetail.goods[0].refund.reason||"")+''}}</view><view class="time data-v-982056aa">2023-12-08 12:45</view></view></block></view>

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refusalToRefund.wxss

@@ -1 +1 @@
-.top-direction.data-v-209e2b02{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-209e2b02{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-209e2b02{color:#f83224}.top-direction .time.data-v-209e2b02{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-209e2b02{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-209e2b02{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}.direction-frist1.data-v-209e2b02{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500;margin-top:20rpx;background-color:#fff;height:100rpx;border-radius:16rpx;padding:0 24rpx}.direction-frist1 .commodity-price.data-v-209e2b02{color:#f83224}
+.top-direction.data-v-982056aa{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-982056aa{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-982056aa{color:#f83224}.top-direction .time.data-v-982056aa{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-982056aa{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-982056aa{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}.direction-frist1.data-v-982056aa{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500;margin-top:20rpx;background-color:#fff;height:100rpx;border-radius:16rpx;padding:0 24rpx}.direction-frist1 .commodity-price.data-v-982056aa{color:#f83224}

unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.wxml

@@ -1 +1 @@
-<view class="page data-v-52d15ddb"><block wx:if="{{refundDetail.goods[0].refund.status==1}}"><refund-successful vue-id="40945150-1" refundDetail="{{refundDetail}}" data-event-opts="{{[['^checkMoney',[['checkMoney']]]]}}" bind:checkMoney="__e" class="data-v-52d15ddb" bind:__l="__l"></refund-successful></block><block wx:if="{{refundDetail.goods[0].refund.status==0}}"><refund-in-progress vue-id="40945150-2" refundDetail="{{refundDetail}}" class="data-v-52d15ddb" bind:__l="__l"></refund-in-progress></block><block wx:if="{{refundDetail.goods[0].refund.status==3}}"><refusal-to-refund vue-id="40945150-3" refundDetail="{{refundDetail}}" class="data-v-52d15ddb" bind:__l="__l"></refusal-to-refund></block><refund-information vue-id="40945150-4" goodsDetail="{{refundDetail.goods[0]}}" refundDetail="{{refundDetail}}" class="data-v-52d15ddb" bind:__l="__l"></refund-information><money-destination vue-id="40945150-5" show="{{show}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-52d15ddb" bind:__l="__l"></money-destination><view class="footer data-v-52d15ddb"><button data-event-opts="{{[['tap',[['platformIntervene',['$event']]]]]}}" class="btn data-v-52d15ddb" bindtap="__e">平台介入</button></view></view>
+<view class="page data-v-d04fac28"><block wx:if="{{refundDetail.goods[0].refund.status==1}}"><refund-successful vue-id="40945150-1" refundDetail="{{refundDetail}}" data-event-opts="{{[['^checkMoney',[['checkMoney']]]]}}" bind:checkMoney="__e" class="data-v-d04fac28" bind:__l="__l"></refund-successful></block><block wx:if="{{refundDetail.goods[0].refund.status==0}}"><refund-in-progress vue-id="40945150-2" refundDetail="{{refundDetail}}" class="data-v-d04fac28" bind:__l="__l"></refund-in-progress></block><block wx:if="{{refundDetail.goods[0].refund.status==2||refundDetail.goods[0].refund.status==3}}"><refusal-to-refund vue-id="40945150-3" refundDetail="{{refundDetail}}" class="data-v-d04fac28" bind:__l="__l"></refusal-to-refund></block><refund-information vue-id="40945150-4" goodsDetail="{{refundDetail.goods[0]}}" refundDetail="{{refundDetail}}" class="data-v-d04fac28" bind:__l="__l"></refund-information><money-destination vue-id="40945150-5" show="{{show}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-d04fac28" bind:__l="__l"></money-destination><view class="footer data-v-d04fac28"><button data-event-opts="{{[['tap',[['platformIntervene',['$event']]]]]}}" class="btn data-v-d04fac28" bindtap="__e">平台介入</button></view></view>

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

@@ -1 +1 @@
-.page.data-v-52d15ddb{padding:20rpx 24rpx;position:relative}.page .footer.data-v-52d15ddb{position:fixed;bottom:0;padding:20rpx 24rpx 60rpx;background-color:#fff;left:0;width:94%;display:flex;justify-content:flex-end}.page .footer .btn.data-v-52d15ddb{margin:0;padding:0;background-color:#fff;border:2rpx solid #979797;color:#222;border-radius:44rpx;width:188rpx;height:78rpx;line-height:78rpx;font-size:28rpx}
+.page.data-v-d04fac28{padding:20rpx 24rpx;position:relative}.page .footer.data-v-d04fac28{position:fixed;bottom:0;padding:20rpx 24rpx 60rpx;background-color:#fff;left:0;width:94%;display:flex;justify-content:flex-end}.page .footer .btn.data-v-d04fac28{margin:0;padding:0;background-color:#fff;border:2rpx solid #979797;color:#222;border-radius:44rpx;width:188rpx;height:78rpx;line-height:78rpx;font-size:28rpx}

unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"0ba5":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={props:{orderInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};t.default=a},"29e1":function(n,t,e){"use strict";e.r(t);var a=e("c287"),r=e("3439");for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);e("2bda");var o=e("828b"),f=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,"479f5734",null,!1,a["a"],void 0);t["default"]=f.exports},"2bda":function(n,t,e){"use strict";var a=e("e2b1"),r=e.n(a);r.a},3439:function(n,t,e){"use strict";e.r(t);var a=e("0ba5"),r=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=r.a},c287:function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},r=[]},e2b1:function(n,t,e){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"2ec4":function(n,t,e){"use strict";e.r(t);var r=e("4243"),a=e("8177");for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);e("51ea");var f,o=e("f0c5"),c=Object(o["a"])(a["default"],r["b"],r["c"],!1,null,"479f5734",null,!1,r["a"],f);t["default"]=c.exports},4243:function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return r}));var a=function(){var n=this,t=n.$createElement;n._self._c},u=[]},"49b1":function(n,t,e){},"51ea":function(n,t,e){"use strict";var r=e("49b1"),a=e.n(r);a.a},"5b13":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};t.default=r},8177:function(n,t,e){"use strict";e.r(t);var r=e("5b13"),a=e.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);t["default"]=a.a}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/applicationInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{"2b24":function(e,n,t){"use strict";var u=t("46a5"),o=t.n(u);o.a},"46a5":function(e,n,t){},"4d13":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(e){e||(this.value2="")}},data:function(){return{value2:""}},methods:{close:function(){}}};n.default=u},"8fda":function(e,n,t){"use strict";t.r(n);var u=t("4d13"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=o.a},"94c2":function(e,n,t){"use strict";t.r(n);var u=t("eb47"),o=t("8fda");for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t("2b24");var r=t("828b"),i=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"86e8a146",null,!1,u["a"],void 0);n["default"]=i.exports},eb47:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"2a30"))}},o=function(){var e=this.$createElement;this._self._c},a=[]}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{"15b7":function(e,n,t){},5393:function(e,n,t){"use strict";t.r(n);var u=t("d692"),o=t("9ee6");for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t("92aa");var r,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"86e8a146",null,!1,u["a"],r);n["default"]=f.exports},"92aa":function(e,n,t){"use strict";var u=t("15b7"),o=t.n(u);o.a},"9ee6":function(e,n,t){"use strict";t.r(n);var u=t("cf3f"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=o.a},cf3f:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(e){e||(this.value2="")}},data:function(){return{value2:""}},methods:{close:function(){}}};n.default=u},d692:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var e=this,n=e.$createElement;e._self._c},a=[]}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {

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

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"3d92":function(t,n,o){"use strict";o.d(n,"b",(function(){return e})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){}));var e=function(){var t=this.$createElement,n=(this._self._c,this.productAndCommodity?null:this.itemInfo.labels.join(" | ")),o=this.itemInfo.goods.discount_price.split("."),e=this.itemInfo.goods.discount_price.split(".");this.$mp.data=Object.assign({},{$root:{g0:n,g1:o,g2:e}})},i=[]},8512:function(t,n,o){"use strict";o.r(n);var e=o("3d92"),i=o("dfdf");for(var u in i)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(u);o("953e");var a=o("828b"),d=Object(a["a"])(i["default"],e["b"],e["c"],!1,null,"5cb20660",null,!1,e["a"],void 0);n["default"]=d.exports},"953e":function(t,n,o){"use strict";var e=o("ea85"),i=o.n(e);i.a},be03:function(t,n,o){"use strict";var e=o("47a9");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e(o("7ca3")),u=(0,i.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=u},dfdf:function(t,n,o){"use strict";o.r(n);var e=o("be03"),i=o.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=i.a},ea85:function(t,n,o){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"504a":function(t,n,e){},"52a1":function(t,n,e){"use strict";var o=e("504a"),a=e.n(o);a.a},"7a07":function(t,n,e){"use strict";e.r(n);var o=e("abee"),a=e("9516");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("52a1");var u,r=e("f0c5"),c=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"5cb20660",null,!1,o["a"],u);n["default"]=c.exports},9516:function(t,n,e){"use strict";e.r(n);var o=e("9bdc"),a=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"9bdc":function(t,n,e){"use strict";var o=e("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=o(e("9523")),i=(0,a.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=i},abee:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement,e=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),o=t.itemInfo.goods.discount_price.split("."),a=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:a}})},i=[]}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/goodsInformation-create-component',
     {

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("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"],{"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-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/components/agreePopup.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{"4bb8":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))}},o=function(){var n=this.$createElement;this._self._c},r=[]},a2b6:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},d700:function(n,e,t){"use strict";t.r(e);var u=t("a2b6"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},eb1c:function(n,e,t){"use strict";var u=t("f4ad"),o=t.n(u);o.a},ed04:function(n,e,t){"use strict";t.r(e);var u=t("4bb8"),o=t("d700");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("eb1c");var a=t("828b"),c=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"cd683952",null,!1,u["a"],void 0);e["default"]=c.exports},f4ad:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{1218:function(n,e,t){},"179b":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},"18a5":function(n,e,t){"use strict";t.r(e);var u=t("179b"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},"1c99":function(n,e,t){"use strict";t.r(e);var u=t("abe9"),o=t("18a5");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("e014");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"cd683952",null,!1,u["a"],a);e["default"]=f.exports},abe9:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},e014:function(n,e,t){"use strict";var u=t("1218"),o=t.n(u);o.a}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/agreePopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/components/goodsInformation.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{"290d2":function(t,n,o){},"4fda":function(t,n,o){"use strict";o.r(n);var e=o("5f15"),i=o("dc1f");for(var d in i)["default"].indexOf(d)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(d);o("d79b");var u=o("828b"),c=Object(u["a"])(i["default"],e["b"],e["c"],!1,null,"694410d7",null,!1,e["a"],void 0);n["default"]=c.exports},"5f15":function(t,n,o){"use strict";o.d(n,"b",(function(){return e})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){}));var e=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,d="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,u="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:i,g3:d,g4:u}})},i=[]},"5f16":function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e},d79b:function(t,n,o){"use strict";var e=o("290d2"),i=o.n(e);i.a},dc1f:function(t,n,o){"use strict";o.r(n);var e=o("5f16"),i=o.n(e);for(var d in e)["default"].indexOf(d)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(d);n["default"]=i.a}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{"4d5d":function(t,n,o){"use strict";o.r(n);var e=o("a7e7"),u=o("9ad9");for(var i in u)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return u[t]}))}(i);o("b930");var r,d=o("f0c5"),c=Object(d["a"])(u["default"],e["b"],e["c"],!1,null,"694410d7",null,!1,e["a"],r);n["default"]=c.exports},68437:function(t,n,o){},"9ad9":function(t,n,o){"use strict";o.r(n);var e=o("b900"),u=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(i);n["default"]=u.a},a7e7:function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return u})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){return e}));var u=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,u="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,r="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:u,g3:i,g4:r}})},i=[]},b900:function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e},b930:function(t,n,o){"use strict";var e=o("68437"),u=o.n(e);u.a}}]);
->>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/goodsInformation-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/homepage/component/goodsCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{"17b1":function(n,t,e){},"55bd":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},6020:function(n,t,e){"use strict";e.r(t);var u=e("e407"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},"95ba":function(n,t,e){"use strict";var u=e("17b1"),a=e.n(u);a.a},ac81:function(n,t,e){"use strict";e.r(t);var u=e("55bd"),a=e("6020");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("95ba");var o=e("828b"),c=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,"a8f49338",null,!1,u["a"],void 0);t["default"]=c.exports},e407:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={data:function(){return{}}}}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{"31a1":function(t,e,n){"use strict";var o=n("5605"),i=n.n(o);i.a},5605:function(t,e,n){},6020:function(t,e,n){"use strict";n.r(e);var o=n("e407"),i=n.n(o);for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);e["default"]=i.a},ac81:function(t,e,n){"use strict";n.r(e);var o=n("e97e"),i=n("6020");for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);n("31a1");var a=n("828b"),r=Object(a["a"])(i["default"],o["b"],o["c"],!1,null,"4022fdbe",null,!1,o["a"],void 0);e["default"]=r.exports},e407:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};e.default=o},e97e:function(t,e,n){"use strict";n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){}));var o=function(){var t=this.$createElement,e=(this._self._c,this.itemInfo.goods.price.split(".")),n=this.itemInfo.goods.price.split(".");this.$mp.data=Object.assign({},{$root:{g0:e,g1:n}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/homepage/component/goodsCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/homepage/component/goodsCard.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['$emit',['toDetail']]]]]}}" class="card data-v-a8f49338" bindtap="__e"><image class="goods-img data-v-a8f49338" src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226275/13/1657/110111/6547bda8F6d14df48/a73646abeaea625a.jpg.avif" mode></image><view class="describe data-v-a8f49338">布兰德软罐头猫咪主食包0内脏 混合口味 实发400…</view><view class="price-sale data-v-a8f49338"><view class="price data-v-a8f49338"><text style="font-size:20rpx;" class="data-v-a8f49338">￥</text><text class="data-v-a8f49338">133</text>.<text style="font-size:20rpx;" class="data-v-a8f49338">22</text></view><view class="sale data-v-a8f49338">销量 500+</view></view><view class="evaluate data-v-a8f49338"><view style="margin-right:12rpx;" class="data-v-a8f49338">500+评价</view><view class="data-v-a8f49338">95%好评</view></view></view>
+<view data-event-opts="{{[['tap',[['$emit',['toDetail','$0'],['itemInfo']]]]]}}" class="card data-v-4022fdbe" bindtap="__e"><image class="goods-img data-v-4022fdbe" src="{{itemInfo.goods.image}}" mode></image><view class="describe data-v-4022fdbe">{{''+itemInfo.goods.name_cn+''}}</view><view class="price-sale data-v-4022fdbe"><view class="price data-v-4022fdbe"><text style="font-size:20rpx;" class="data-v-4022fdbe">￥</text><text class="data-v-4022fdbe">{{$root.g0[0]}}</text>.<text style="font-size:20rpx;" class="data-v-4022fdbe">{{$root.g1[1]}}</text></view><view class="sale data-v-4022fdbe">{{'销量 '+itemInfo.goods.sale_num+''}}</view></view><view class="evaluate data-v-4022fdbe"><view style="margin-right:12rpx;" class="data-v-4022fdbe">{{''+itemInfo.goods.comment_num+'评价'}}</view><view class="data-v-4022fdbe">{{''+itemInfo.goods.comment_good_rapporto+'%好评'}}</view></view></view>

unpackage/dist/build/mp-weixin/pageD/homepage/component/goodsCard.wxss

@@ -1 +1 @@
-.card.data-v-a8f49338{width:324rpx;margin-bottom:20rpx}.card .goods-img.data-v-a8f49338{width:324rpx;height:324rpx;border-radius:16rpx}.card .describe.data-v-a8f49338{font-size:28rpx;color:#333;font-weight:600;width:100%;white-space:normal;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;margin-top:20rpx}.card .price-sale.data-v-a8f49338{display:flex;margin-top:16rpx;align-items:flex-end}.card .price-sale .price.data-v-a8f49338{color:#f83224;font-weight:600}.card .price-sale .sale.data-v-a8f49338{font-size:20rpx;color:#333;opacity:.8;margin-bottom:4rpx;margin-left:10rpx}.card .evaluate.data-v-a8f49338{display:flex;align-items:center;font-size:24rpx;color:#777;margin-top:16rpx}
+.card.data-v-4022fdbe{width:324rpx;margin-bottom:20rpx}.card .goods-img.data-v-4022fdbe{width:324rpx;height:324rpx;border-radius:16rpx}.card .describe.data-v-4022fdbe{font-size:28rpx;color:#333;font-weight:600;width:100%;white-space:normal;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;margin-top:20rpx}.card .price-sale.data-v-4022fdbe{display:flex;margin-top:16rpx;align-items:flex-end}.card .price-sale .price.data-v-4022fdbe{color:#f83224;font-weight:600}.card .price-sale .sale.data-v-4022fdbe{font-size:20rpx;color:#333;opacity:.8;margin-bottom:4rpx;margin-left:10rpx}.card .evaluate.data-v-4022fdbe{display:flex;align-items:center;font-size:24rpx;color:#777;margin-top:16rpx}

unpackage/dist/build/mp-weixin/pageD/paymentOrder/paymentOrder.wxss

@@ -1 +1 @@
-.page.data-v-53ca339c{padding:20rpx 24rpx;position:relative}.page ._top.data-v-53ca339c{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-53ca339c{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-53ca339c{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-53ca339c{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-53ca339c{font-size:28rpx}.page ._top ._weight.data-v-53ca339c{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-53ca339c{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-53ca339c{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-53ca339c{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-53ca339c{width:36rpx;height:36rpx}.page .footer.data-v-53ca339c{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-53ca339c{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-53ca339c{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-53ca339c{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-53ca339c{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-53ca339c{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}
+.page.data-v-d440933c{padding:20rpx 24rpx;position:relative}.page ._top.data-v-d440933c{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-d440933c{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-d440933c{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-d440933c{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-d440933c{font-size:28rpx}.page ._top ._weight.data-v-d440933c{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-d440933c{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-d440933c{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-d440933c{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-d440933c{width:36rpx;height:36rpx}.page .footer.data-v-d440933c{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-d440933c{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-d440933c{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-d440933c{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-d440933c{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-d440933c{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}