冲突

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

@@ -1 +1 @@
-<view class="data-v-74fb450d"><view class="top-search data-v-74fb450d"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-74fb450d" bind:__l="__l"></u--input><view class="top-tab data-v-74fb450d"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-74fb450d',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-74fb450d"><view class="prompt data-v-74fb450d"><image class="prompt-icon data-v-74fb450d" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-74fb450d"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-74fb450d" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-9241b66e"><view class="top-search data-v-9241b66e"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-9241b66e" bind:__l="__l"></u--input><view class="top-tab data-v-9241b66e"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-9241b66e',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-9241b66e',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-9241b66e',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-9241b66e',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-9241b66e"><view class="prompt data-v-9241b66e"><image class="prompt-icon data-v-9241b66e" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-9241b66e"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-9241b66e" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -1 +1 @@
-.top-search.data-v-74fb450d{background-color:#fff;padding:20rpx 24rpx}.data-v-74fb450d .u-input{background-color:#f4f4f4}.top-tab.data-v-74fb450d{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-74fb450d{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-74fb450d{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-74fb450d::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-74fb450d{padding:20rpx 24rpx}.content .prompt.data-v-74fb450d{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-74fb450d{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-9241b66e{background-color:#fff;padding:20rpx 24rpx}.data-v-9241b66e .u-input{background-color:#f4f4f4}.top-tab.data-v-9241b66e{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-9241b66e{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-9241b66e{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-9241b66e::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-9241b66e{padding:20rpx 24rpx}.content .prompt.data-v-9241b66e{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-9241b66e{width:36rpx;height:36rpx;margin-right:20rpx}

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

@@ -1,4 +1,4 @@
-(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=[]}}]);
+(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("cf3f0"),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},cf3f0: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=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var i=n("cf0f"),o=n("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);n("68d2");var s,f=n("f0c5"),a=Object(f["a"])(o["default"],i["b"],i["c"],!1,null,"2f75b080",null,!1,i["a"],s);e["default"]=a.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var i=n("65b3"),o=n.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);e["default"]=o.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=i},"68d2":function(t,e,n){"use strict";var i=n("f6ca"),o=n.n(i);o.a},cf0f:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return i}));var o=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.sku_item&&t.itemInfo.goods.sku_item.length>0),i=n?t.itemInfo.goods.sku_item[0].price.split("."):null,o=n?t.itemInfo.goods.sku_item[0].price.split("."):null,u=t.itemInfo.order_goods.amount.split("."),s=t.itemInfo.order_goods.amount.split("."),f=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),a=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i,g2:o,g3:u,g4:s,m0:f,m1:a}})},u=[]},f6ca:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"0143":function(t,e,n){},"33ebd":function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return i}));var o=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.discount_price.split(".")),i=t.itemInfo.goods.discount_price.split("."),o=t.itemInfo.order_goods.amount.split("."),u=t.itemInfo.order_goods.amount.split("."),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),a=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i,g2:o,g3:u,m0:s,m1:a}})},u=[]},"34a9":function(t,e,n){"use strict";n.r(e);var i=n("33ebd"),o=n("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);n("ef4d");var s,a=n("f0c5"),f=Object(a["a"])(o["default"],i["b"],i["c"],!1,null,"5c53c12a",null,!1,i["a"],s);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var i=n("65b3"),o=n.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);e["default"]=o.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=i},ef4d:function(t,e,n){"use strict";var i=n("0143"),o=n.n(i);o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesManage/component/detailCard-create-component',
     {

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

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

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

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

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

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

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

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

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

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