冲突

pageA/order.vue

@@ -120,7 +120,6 @@
                         1000) /
                       1000000
                 }}</text>
-<<<<<<< HEAD
 							</view>
 <!-- 							<u-number-box @change="valChange" v-model="value">
 								<view slot="minus" class="">
@@ -184,103 +183,6 @@
 							<view class="money" style="color: #f83224; font-size: 20rpx">
 								<text>¥</text>
 								<text style="font-size: 28rpx">{{
-=======
-              </view>
-              <u-number-box @change="valChange" v-model="value">
-                <view slot="minus" class="">
-                  <u-icon name="minus" size="12"></u-icon>
-                </view>
-                <input
-                  slot="input"
-                  v-model="value"
-                  style="width: 40px; text-align: center"
-                  class="input"
-                />
-                <view slot="plus" class="">
-                  <u-icon name="plus" size="12"></u-icon>
-                </view>
-              </u-number-box>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 物流 -->
-    <view class="logistics u-flex u-row-between">
-      <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
-      <view class="u-flex" @click="changwu">
-        <text class="change">{{
-          containname1 ? type1 + " | " + containname1 : i18n.selection
-        }}</text>
-        <u-icon name="arrow-right" size="16"></u-icon>
-      </view>
-    </view>
-    <!-- 推荐 -->
-    <view class="recommend">
-      <view class="top">
-        <image
-          v-if="language == 'zh-CN'"
-          src="static/images/recommend.png"
-          style="width: 124rpx; height: 30rpx"
-          mode=""
-        ></image>
-        <image
-          v-if="language == 'en-US'"
-          src="static/images/recommend1.png"
-          style="width: 200rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-        <image
-          v-if="language == 'es-ES'"
-          src="static/images/recommend2.png"
-          style="width: 200rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-        <image
-          v-if="language == 'it-IT'"
-          src="static/images/recommend3.png"
-          style="width: 200rpx; height: 30rpx"
-          mode=""
-        >
-        </image>
-      </view>
-      <view class="bottom">
-        <scroll-view
-          scroll-x
-          class="u-flex"
-          style="column: gap 28rpx; display: flex"
-        >
-          <view class="u-flex" style="column-gap: 16rpx">
-            <view
-              class=""
-              v-for="(item, idx) in swiptlist"
-              :key="idx"
-              @click="todetail(item.id)"
-            >
-              <image
-                :src="item.image"
-                style="width: 156rpx; height: 156rpx"
-                mode=""
-              >
-              </image>
-              <view class="title" v-if="language == 'zh-CN'">
-                {{ item.name_cn }}
-              </view>
-              <view class="title" v-if="language == 'en-US'">
-                {{ item.name_en }}
-              </view>
-              <view class="title" v-if="language == 'es-ES'">
-                {{ item.name_es }}
-              </view>
-              <view class="title" v-if="language == 'it-IT'">
-                {{ item.name_ita }}
-              </view>
-              <view class="money" style="color: #f83224; font-size: 20rpx">
-                <text>¥</text>
-                <text style="font-size: 28rpx">{{
->>>>>>> 000d5b8b036475b70bc86048052bcb28e709ed77
                   item.is_discount == 0
                     ? item.discount_price.slice(0, -3)
                     : item.price.slice(0, -3)

unpackage/dist/build/mp-weixin/pageA/order.json

@@ -3,7 +3,6 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
     "u-popup": "/uview-ui/components/u-popup/u-popup"
   }
 }

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

@@ -1 +1 @@
-<view class="data-v-fbdd6f38"><view class="top-search data-v-fbdd6f38"><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-fbdd6f38" bind:__l="__l"></u--input><view class="top-tab data-v-fbdd6f38"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-fbdd6f38',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-fbdd6f38',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-fbdd6f38',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-fbdd6f38',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-fbdd6f38"><view class="prompt data-v-fbdd6f38"><image class="prompt-icon data-v-fbdd6f38" 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-fbdd6f38"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]]]}}" bind:toInformation="__e" class="data-v-fbdd6f38" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-49e69dfe"><view class="top-search data-v-49e69dfe"><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-49e69dfe" bind:__l="__l"></u--input><view class="top-tab data-v-49e69dfe"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-49e69dfe',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-49e69dfe"><view class="prompt data-v-49e69dfe"><image class="prompt-icon data-v-49e69dfe" 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-49e69dfe"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-49e69dfe" bind:__l="__l"></package-card></view></block></view></view>

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

@@ -1 +1 @@
-.top-search.data-v-fbdd6f38{background-color:#fff;padding:20rpx 24rpx}.data-v-fbdd6f38 .u-input{background-color:#f4f4f4}.top-tab.data-v-fbdd6f38{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-fbdd6f38{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-fbdd6f38{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-fbdd6f38::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-fbdd6f38{padding:20rpx 24rpx}.content .prompt.data-v-fbdd6f38{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-fbdd6f38{width:36rpx;height:36rpx;margin-right:20rpx}
+.top-search.data-v-49e69dfe{background-color:#fff;padding:20rpx 24rpx}.data-v-49e69dfe .u-input{background-color:#f4f4f4}.top-tab.data-v-49e69dfe{margin-top:10rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-49e69dfe{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-49e69dfe{position:relative;font-weight:600;color:#222}.top-tab .commodity.data-v-49e69dfe::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.content.data-v-49e69dfe{padding:20rpx 24rpx}.content .prompt.data-v-49e69dfe{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-49e69dfe{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"],{"0cb8":function(t,e,n){"use strict";var r=n("e7c9"),u=n.n(r);u.a},"1e1d":function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return r}));var u=function(){var t=this,e=t.$createElement,n=(t._self._c,t.__map(t.itemInfo.order_goods,(function(e,n){var r=t.__get_orig(e),u=e.amount.split("."),o=e.amount.split(".");return{$orig:r,g0:u,g1:o}})));t.$mp.data=Object.assign({},{$root:{l0:n}})},o=[]},"67f8":function(t,e,n){"use strict";n.r(e);var r=n("d77c"),u=n.n(r);for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);e["default"]=u.a},d77c:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};e.default=r},e1ce:function(t,e,n){"use strict";n.r(e);var r=n("1e1d"),u=n("67f8");for(var o in u)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(o);n("0cb8");var a,c=n("f0c5"),f=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"4e81abe7",null,!1,r["a"],a);e["default"]=f.exports},e7c9:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{2961:function(e,n,r){"use strict";var u=r("d360"),t=r.n(u);t.a},"67f8":function(e,n,r){"use strict";r.r(n);var u=r("d77c"),t=r.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return u[e]}))}(f);n["default"]=t.a},cd12:function(e,n,r){"use strict";var u;r.d(n,"b",(function(){return t})),r.d(n,"c",(function(){return f})),r.d(n,"a",(function(){return u}));var t=function(){var e=this,n=e.$createElement,r=(e._self._c,e.__map(e.itemInfo.order_goods,(function(n,r){var u=e.__get_orig(n),t=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,f=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,c=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,d=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:c,g3:d}})));e.$mp.data=Object.assign({},{$root:{l0:r}})},f=[]},d360:function(e,n,r){},d77c:function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=u},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("cd12"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("2961");var c,d=r("f0c5"),a=Object(d["a"])(t["default"],u["b"],u["c"],!1,null,"2c47f626",null,!1,u["a"],c);n["default"]=a.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

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

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

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{"179b":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{value:""}},methods:{submit:function(){if("请确认是否退款"==this.title){if(!this.value)return void n.showToast({title:"请输入退款金额",icon:"none"});this.$emit("close",1,this.value)}else this.$emit("close",1)}}};t.default=e}).call(this,e("543d")["default"])},1842:function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-popup/u-popup")]).then(e.bind(null,"2f21"))},"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"bead"))}},o=function(){var n=this,t=n.$createElement;n._self._c},i=[]},"18a5":function(n,t,e){"use strict";e.r(t);var u=e("179b"),o=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=o.a},"1c99":function(n,t,e){"use strict";e.r(t);var u=e("1842"),o=e("18a5");for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);e("59ad");var a,r=e("f0c5"),c=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"106f66da",null,!1,u["a"],a);t["default"]=c.exports},"59ad":function(n,t,e){"use strict";var u=e("77f6"),o=e.n(u);o.a},"77f6":function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{"179b":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{value:""}},methods:{submit:function(){if("请确认是否退款"==this.title){if(!this.value)return void n.showToast({title:"请输入退款金额",icon:"none"});this.$emit("close",1,this.value)}else this.$emit("close",1)}}};t.default=e}).call(this,e("543d")["default"])},1842:function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-popup/u-popup")]).then(e.bind(null,"2f21"))},"u-Input":function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u--input/u--input")]).then(e.bind(null,"bead"))}},o=function(){var n=this,t=n.$createElement;n._self._c},i=[]},"18a5":function(n,t,e){"use strict";e.r(t);var u=e("179b"),o=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=o.a},"1c99":function(n,t,e){"use strict";e.r(t);var u=e("1842"),o=e("18a5");for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);e("59adc");var a,r=e("f0c5"),c=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"106f66da",null,!1,u["a"],a);t["default"]=c.exports},"59adc":function(n,t,e){"use strict";var u=e("77f6"),o=e.n(u);o.a},"77f6":function(n,t,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/agreePopup-create-component',
     {

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

@@ -1 +1 @@
-.page.data-v-05fe80d1{padding:20rpx 24rpx}.page .top-detail.data-v-05fe80d1{display:flex;justify-content:space-around;align-items:center;height:144rpx;background:linear-gradient(180deg,#f6e1de,#efefef);border-radius:16rpx 16rpx 0 0}.page .top-detail .title.data-v-05fe80d1{color:rgba(34,34,34,.6);font-size:32rpx}.page .top-detail .arrow.data-v-05fe80d1{width:98rpx;height:8rpx}.page .logistics.data-v-05fe80d1{background-color:#fff;border-radius:16rpx;padding:0 20rpx;position:relative;top:-20rpx;padding-bottom:20rpx}.page .logistics ._detail-1.data-v-05fe80d1{display:flex;justify-content:space-between;font-size:28rpx;color:#666;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.1);padding-top:28rpx}.page .logistics .logistics-detail.data-v-05fe80d1{display:flex;justify-content:space-between;font-size:26rpx;color:#333;height:104rpx;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .logistics .logistics-information.data-v-05fe80d1{padding:20rpx 0}.page .logistics .logistics-information .information.data-v-05fe80d1{position:relative}
+.page.data-v-6ac3e546{padding:20rpx 24rpx}.page .top-detail.data-v-6ac3e546{display:flex;justify-content:space-around;align-items:center;height:144rpx;background:linear-gradient(180deg,#f6e1de,#efefef);border-radius:16rpx 16rpx 0 0}.page .top-detail .title.data-v-6ac3e546{color:rgba(34,34,34,.6);font-size:32rpx}.page .top-detail .arrow.data-v-6ac3e546{width:98rpx;height:8rpx}.page .logistics.data-v-6ac3e546{background-color:#fff;border-radius:16rpx;padding:0 20rpx;position:relative;top:-20rpx;padding-bottom:20rpx}.page .logistics .package.data-v-6ac3e546{margin-top:20rpx}.page .logistics ._detail-1.data-v-6ac3e546{display:flex;justify-content:space-between;font-size:28rpx;color:#666;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.1);padding-top:28rpx}.page .logistics .logistics-detail.data-v-6ac3e546{display:flex;justify-content:space-between;font-size:26rpx;color:#333;height:104rpx;align-items:center;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.page .logistics .logistics-information.data-v-6ac3e546{padding:20rpx 0}.page .logistics .logistics-information .information.data-v-6ac3e546{position:relative}

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(n,e,t){"use strict";t.r(e);var u=t("2e03"),o=t("58e4");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("34f4");var c,f=t("f0c5"),i=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"4b0e8fc8",null,!1,u["a"],c);e["default"]=i.exports},"1ce0":function(n,e,t){},"2e03":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={uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-icon/u-icon")]).then(t.bind(null,"01eb"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"34f4":function(n,e,t){"use strict";var u=t("1ce0"),o=t.n(u);o.a},"58e4":function(n,e,t){"use strict";t.r(e);var u=t("694c"),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},"694c":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=u}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{"0fd8":function(t,n,e){"use strict";e.r(n);var u=e("b22d"),r=e("58e4");for(var a in r)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(a);e("9a21");var f,o=e("f0c5"),c=Object(o["a"])(r["default"],u["b"],u["c"],!1,null,"c4a19900",null,!1,u["a"],f);n["default"]=c.exports},"58e4":function(t,n,e){"use strict";e.r(n);var u=e("694c"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=r.a},"694c":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};n.default=u},"9a21":function(t,n,e){"use strict";var u=e("d45f"),r=e.n(u);r.a},b22d:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var r=function(){var t=this,n=t.$createElement;t._self._c},a=[]},d45f:function(t,n,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/commodity-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.json

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

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxml

@@ -1 +1 @@
-<view class="list data-v-4b0e8fc8"><view class="merchant data-v-4b0e8fc8"><image class="merchant-img data-v-4b0e8fc8" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-4b0e8fc8">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-4b0e8fc8"><image class="detail-img data-v-4b0e8fc8" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-4b0e8fc8"><view class="data-v-4b0e8fc8"><text class="toptitle data-v-4b0e8fc8">{{item.goods.name_cn}}</text><view class="weight data-v-4b0e8fc8">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-4b0e8fc8"><view class="money data-v-4b0e8fc8"><text class="data-v-4b0e8fc8">¥</text><text style="font-size:34rpx;" class="data-v-4b0e8fc8">{{item.sku_item.price}}</text></view><view class="stepping data-v-4b0e8fc8"><u-icon vue-id="{{'e771f670-1-'+__i0__}}" name="minus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','reduce']]]]]}}" bind:click="__e" class="data-v-4b0e8fc8" bind:__l="__l"></u-icon><text class="data-v-4b0e8fc8">{{goodsValue}}</text><u-icon vue-id="{{'e771f670-2-'+__i0__}}" name="plus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','increase']]]]]}}" bind:click="__e" class="data-v-4b0e8fc8" bind:__l="__l"></u-icon></view></view></view></view></block></view>
+<view class="list data-v-c4a19900"><view class="merchant data-v-c4a19900"><image class="merchant-img data-v-c4a19900" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-c4a19900">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-c4a19900"><image class="detail-img data-v-c4a19900" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-c4a19900"><view class="data-v-c4a19900"><text class="toptitle data-v-c4a19900">{{item.goods.name_cn}}</text><view class="weight data-v-c4a19900">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-c4a19900"><view class="money data-v-c4a19900"><text class="data-v-c4a19900">¥</text><text style="font-size:34rpx;" class="data-v-c4a19900">{{item.sku_item.price}}</text></view><view class="stepping data-v-c4a19900"><text class="data-v-c4a19900">x</text><text class="data-v-c4a19900">{{goodsValue}}</text></view></view></view></view></block></view>

unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/commodity.wxss

@@ -1 +1 @@
-.list.data-v-4b0e8fc8{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-4b0e8fc8{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-4b0e8fc8{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-4b0e8fc8{font-size:30rpx;color:#222}.list .detail.data-v-4b0e8fc8{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-4b0e8fc8{width:184rpx;height:184rpx;margin-right:24rpx}.list .detail .detail-right.data-v-4b0e8fc8{flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1}.list .detail .detail-right .toptitle.data-v-4b0e8fc8{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;width:100%;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all;margin-bottom:16rpx}.list .detail .detail-right .weight.data-v-4b0e8fc8{font-family:PingFangSC,PingFang SC;font-size:24rpx;color:rgba(34,34,34,.6);line-height:34rpx}.list .detail .detail-right .money.data-v-4b0e8fc8{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.list .detail .detail-right .stepping.data-v-4b0e8fc8{display:flex;width:140rpx;height:40rpx;justify-content:space-around;align-items:center;font-size:20rpx;border:2rpx solid hsla(0,0%,59.2%,.4);border-radius:20rpx}
+.list.data-v-c4a19900{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:28rpx 26rpx 36rpx 24rpx}.list .merchant.data-v-c4a19900{display:flex;justify-content:flex-start}.list .merchant .merchant-img.data-v-c4a19900{width:38rpx;height:38rpx;margin-right:16rpx}.list .merchant .merchant-name.data-v-c4a19900{font-size:30rpx;color:#222}.list .detail.data-v-c4a19900{margin-top:32rpx;display:flex}.list .detail .detail-img.data-v-c4a19900{width:184rpx;height:184rpx;margin-right:24rpx}.list .detail .detail-right.data-v-c4a19900{flex-direction:column;justify-content:space-between;height:184rpx;display:flex;flex:1}.list .detail .detail-right .toptitle.data-v-c4a19900{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;width:100%;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all;margin-bottom:16rpx}.list .detail .detail-right .weight.data-v-c4a19900{font-family:PingFangSC,PingFang SC;font-size:24rpx;color:rgba(34,34,34,.6);line-height:34rpx}.list .detail .detail-right .money.data-v-c4a19900{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.list .detail .detail-right .stepping.data-v-c4a19900{display:flex;width:50rpx;height:40rpx;justify-content:space-around;align-items:center;font-size:30rpx;border-radius:20rpx}

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/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {

unpackage/dist/dev/mp-weixin/pageA/order.json

@@ -3,7 +3,6 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
     "u-popup": "/uview-ui/components/u-popup/u-popup"
   }
 }