冲突

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"0b33":function(n,t,e){"use strict";var o=e("54cd"),r=e.n(o);r.a},"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=r},"54cd":function(n,t,e){},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),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},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("e148"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("0b33");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"57acfd12",null,!1,o["a"],u);t["default"]=a.exports},e148: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={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.sku_item?t.discount_price.split("."):null,i=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},i={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=i},4090:function(n,t,e){"use strict";var o=e("897b"),i=e.n(o);i.a},"897b":function(n,t,e){},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),i=e.n(o);for(var r in o)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(r);t["default"]=i.a},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("c0ff"),i=e("9b65");for(var r in i)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(r);e("4090");var u,c=e("f0c5"),f=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,"09eff53c",null,!1,o["a"],u);t["default"]=f.exports},c0ff:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},i=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),i=t.sku_item?t.discount_price.split("."):null,r=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:i,g1:r}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,i=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:i}})},r=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"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},"7b7d":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,a=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:a,g3:d}}))),u=1==e.itemInfo.order_goods[0].refund.status?e.itemInfo.order_goods[0].refund.actual_refund_price&&0!=Number(e.itemInfo.order_goods[0].refund.actual_refund_price):null;e.$mp.data=Object.assign({},{$root:{l0:r,m0:u}})},f=[]},ac3a: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},e15a:function(e,n,r){"use strict";var u=r("ac3a"),t=r.n(u);t.a},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("7b7d"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("e15a");var a,d=r("f0c5"),c=Object(d["a"])(t["default"],u["b"],u["c"],!1,null,"2a5f320a",null,!1,u["a"],a);n["default"]=c.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"4fb3":function(e,n,r){"use strict";var u=r("c334"),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},c334: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{}}}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{}}};n.default=u},d8b7: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,d=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,c=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:d,g3:c}}))),u=1==e.itemInfo.order_goods[0].refund.status?e.itemInfo.order_goods[0].refund.actual_refund_price&&0!=Number(e.itemInfo.order_goods[0].refund.actual_refund_price):null;e.$mp.data=Object.assign({},{$root:{l0:r,m0:u}})},f=[]},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("d8b7"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("4fb3");var d,c=r("f0c5"),a=Object(c["a"])(t["default"],u["b"],u["c"],!1,null,"0fd2f1a8",null,!1,u["a"],d);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-6baa5b89{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-6baa5b89{padding:0 24rpx 50rpx}.top-tab.data-v-6baa5b89{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-6baa5b89{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-6baa5b89{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-6baa5b89::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}
+.inp.data-v-0caa4984{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-0caa4984{padding:0 24rpx 50rpx}.top-tab.data-v-0caa4984{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-0caa4984{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-0caa4984{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-0caa4984::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/switchLanguage/switchLanguage.wxml

@@ -1 +1 @@
-<view class="page data-v-19575f46"><view class="btn-list data-v-19575f46"><view class="language data-v-19575f46" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-19575f46">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-19575f46" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-19575f46" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-19575f46">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-19575f46" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-19575f46" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-19575f46">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-19575f46" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-19575f46" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-19575f46">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-19575f46" src="../../static/mine/326.png" mode></image></block></view></view></view>
+<view class="page data-v-0b10d31d"><view class="btn-list data-v-0b10d31d"><view class="language data-v-0b10d31d" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-0b10d31d" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-0b10d31d">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-0b10d31d" src="../../static/mine/326.png" mode></image></block></view></view></view>

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

@@ -1 +1 @@
-.page.data-v-19575f46{padding:20rpx 24rpx}.page .btn-list.data-v-19575f46{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-19575f46{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-19575f46{width:36rpx;height:36rpx}
+.page.data-v-0b10d31d{padding:20rpx 24rpx}.page .btn-list.data-v-0b10d31d{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-0b10d31d{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-0b10d31d{width:36rpx;height:36rpx}

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

@@ -1 +1 @@
-.top-tab-search.data-v-43683496{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-43683496{display:flex;align-items:center}.top-tab-search .search .screen.data-v-43683496{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-43683496{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-43683496{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-43683496{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-43683496{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-43683496::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-43683496{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-43683496{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-43683496{margin-right:20rpx}.footer.data-v-43683496{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-43683496{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-43683496{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-43683496{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}
+.top-tab-search.data-v-19170273{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-19170273{display:flex;align-items:center}.top-tab-search .search .screen.data-v-19170273{display:flex;align-items:center;font-size:26rpx;color:#333;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-19170273{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-19170273{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-19170273{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-19170273{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-19170273::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.page.data-v-19170273{padding:20rpx 24rpx;background-color:#fff;margin-bottom:150rpx}.page .list.data-v-19170273{display:flex;flex-wrap:nowrap;align-items:center}.page .list .radio.data-v-19170273{margin-right:20rpx}.footer.data-v-19170273{position:fixed;display:flex;align-items:center;justify-content:space-between;bottom:0;background-color:#fff;width:93%;padding:16rpx 24rpx 70rpx 24rpx}.footer .batch.data-v-19170273{color:#333;font-size:28rpx;margin-right:50rpx;display:flex;align-items:center}.footer .btn-1.data-v-19170273{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#fff;color:#f83224;border:2rpx solid #f83224;padding:0;margin:0;font-size:30rpx}.footer .btn.data-v-19170273{width:236rpx;height:76rpx;border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;font-size:30rpx}

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/batchDiscountPopup"],{"251c":function(e,t,n){"use strict";n.r(t);var o=n("d7c7"),i=n("57fe");for(var u in i)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(u);n("d4cc");var c,r=n("f0c5"),a=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"051884ec",null,!1,o["a"],c);t["default"]=a.exports},"57fe":function(e,t,n){"use strict";n.r(t);var o=n("82da"),i=n.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(u);t["default"]=i.a},"82da":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){this.discountPrice=Number(this.selectGoodsInformation.goods.price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.price)-this.discountPrice}}};t.default=o},aa86:function(e,t,n){},d4cc:function(e,t,n){"use strict";var o=n("aa86"),i=n.n(o);i.a},d7c7:function(e,t,n){"use strict";n.d(t,"b",(function(){return i})),n.d(t,"c",(function(){return u})),n.d(t,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u-popup/u-popup")]).then(n.bind(null,"2f21"))},"u-Input":function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u--input/u--input")]).then(n.bind(null,"bead"))}},i=function(){var e=this,t=e.$createElement;e._self._c},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/batchDiscountPopup"],{"251c":function(t,e,n){"use strict";n.r(e);var o=n("8ba2"),i=n("57fe");for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);n("7416");var r,c=n("f0c5"),s=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,"166c0b7b",null,!1,o["a"],r);e["default"]=s.exports},"57fe":function(t,e,n){"use strict";n.r(e);var o=n("82da"),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},6108:function(t,e,n){},7416:function(t,e,n){"use strict";var o=n("6108"),i=n.n(o);i.a},"82da":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},computed:{i18n:function(){return this.$t("index")}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(t){this.discountPrice=Number(this.selectGoodsInformation.goods.price)*(.01*Number(t)),this.preferential=Number(this.selectGoodsInformation.goods.price)-this.discountPrice}}};e.default=o},"8ba2":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u-popup/u-popup")]).then(n.bind(null,"2f21"))},"u-Input":function(){return Promise.all([n.e("common/vendor"),n.e("uview-ui/components/u--input/u--input")]).then(n.bind(null,"bead"))}},i=function(){var t=this,e=t.$createElement;t._self._c},u=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/batchDiscountPopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/batchDiscountPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="72713cc4-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-051884ec" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-051884ec"><view class="goods-information data-v-051884ec">我要打折</view><view class="discount data-v-051884ec"><view class="data-v-051884ec">折扣</view><u--input vue-id="{{('72713cc4-2')+','+('72713cc4-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="2" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-051884ec" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-051884ec">%</view></view><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-051884ec" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="72713cc4-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-166c0b7b" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-166c0b7b"><view class="goods-information data-v-166c0b7b">{{''+i18n.wantDiscount}}</view><view class="discount data-v-166c0b7b"><view class="data-v-166c0b7b">{{''+i18n.discount+''}}</view><u--input vue-id="{{('72713cc4-2')+','+('72713cc4-1')}}" inputAlign="right" placeholder="{{i18n.originalPrice}}" border="none" type="number" maxlength="2" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-166c0b7b" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-166c0b7b">%</view></view><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-166c0b7b" bindtap="__e">{{i18n.enter}}</button></view></u-popup>

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/batchDiscountPopup.wxss

@@ -1 +1 @@
-.content.data-v-051884ec{padding:30rpx 24rpx}.content .goods-information.data-v-051884ec{display:flex;justify-content:center;font-weight:600}.content .goods-information .goods-img.data-v-051884ec{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-051884ec{display:flex;flex-direction:column;justify-content:space-around}.content .goods-information .goods-right .title.data-v-051884ec{font-size:28rpx;color:#333}.content .goods-information .goods-right .price.data-v-051884ec{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-051884ec{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-051884ec{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-051884ec{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-051884ec{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:100rpx}
+.content.data-v-166c0b7b{padding:30rpx 24rpx}.content .goods-information.data-v-166c0b7b{display:flex;justify-content:center;font-weight:600}.content .goods-information .goods-img.data-v-166c0b7b{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-166c0b7b{display:flex;flex-direction:column;justify-content:space-around}.content .goods-information .goods-right .title.data-v-166c0b7b{font-size:28rpx;color:#333}.content .goods-information .goods-right .price.data-v-166c0b7b{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-166c0b7b{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-166c0b7b{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-166c0b7b{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-166c0b7b{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:100rpx}

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.price)-this.discountPrice}}};n.default=o},8482:function(e,n,t){},caec:function(e,n,t){"use strict";t.r(n);var o=t("f6f0"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("f7e8");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"2051c91a",null,!1,o["a"],c);n["default"]=s.exports},f6f0:function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},f7e8:function(e,n,t){"use strict";var o=t("8482"),i=t.n(o);i.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},computed:{i18n:function(){return this.$t("index")}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.price)-this.discountPrice}}};n.default=o},"4caa":function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},"7df7":function(e,n,t){"use strict";var o=t("c36e"),i=t.n(o);i.a},c36e:function(e,n,t){},caec:function(e,n,t){"use strict";t.r(n);var o=t("4caa"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("7df7");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"15ef13e4",null,!1,o["a"],c);n["default"]=s.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/discountsPopup-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-2051c91a" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-2051c91a"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-2051c91a"><image class="goods-img data-v-2051c91a" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-2051c91a"><view class="title data-v-2051c91a">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-2051c91a">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-2051c91a"><view class="data-v-2051c91a">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-2051c91a" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-2051c91a">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-2051c91a"><view class="_text-1 data-v-2051c91a"><text class="data-v-2051c91a">折扣价</text><text class="data-v-2051c91a">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-2051c91a"><text class="data-v-2051c91a">优惠</text><text style="color:#f83224;" class="data-v-2051c91a">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-2051c91a" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-15ef13e4" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-15ef13e4"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-15ef13e4"><image class="goods-img data-v-15ef13e4" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-15ef13e4"><view class="title data-v-15ef13e4">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-15ef13e4">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-15ef13e4"><view class="data-v-15ef13e4">{{''+i18n.discount+''}}</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="{{i18n.originalPrice}}" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-15ef13e4" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-15ef13e4">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-15ef13e4"><view class="_text-1 data-v-15ef13e4"><text class="data-v-15ef13e4">{{i18n.Discounted}}</text><text class="data-v-15ef13e4">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-15ef13e4"><text class="data-v-15ef13e4">{{i18n.preferential}}</text><text style="color:#f83224;" class="data-v-15ef13e4">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-15ef13e4" bindtap="__e">{{i18n.enter}}</button></view></u-popup>

unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxss

@@ -1 +1 @@
-.content.data-v-2051c91a{padding:30rpx 24rpx}.content .goods-information.data-v-2051c91a{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-2051c91a{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-2051c91a{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-2051c91a{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-2051c91a{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-2051c91a{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-2051c91a{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-2051c91a{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-2051c91a{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}
+.content.data-v-15ef13e4{padding:30rpx 24rpx}.content .goods-information.data-v-15ef13e4{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-15ef13e4{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-15ef13e4{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-15ef13e4{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-15ef13e4{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-15ef13e4{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-15ef13e4{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-15ef13e4{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-15ef13e4{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/screenPopup"],{"4b2a":function(t,n,e){},8584: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},"86f5":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),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,"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"))}},u=function(){var t=this,n=t.$createElement;t._self._c},c=[]},b607:function(t,n,e){"use strict";var o=e("4b2a"),u=e.n(o);u.a},d687:function(t,n,e){"use strict";e.r(n);var o=e("86f5"),u=e("d7ec");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("b607");var a,i=e("f0c5"),r=Object(i["a"])(u["default"],o["b"],o["c"],!1,null,"dda31df0",null,!1,o["a"],a);n["default"]=r.exports},d7ec:function(t,n,e){"use strict";e.r(n);var o=e("8584"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/screenPopup"],{"4da7":function(t,n,e){"use strict";e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),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,"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"))}},u=function(){var t=this,n=t.$createElement;t._self._c},c=[]},6872:function(t,n,e){"use strict";var o=e("695d"),u=e.n(o);u.a},"695d":function(t,n,e){},8584: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}},computed:{i18n:function(){return this.$t("index")}},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},d687:function(t,n,e){"use strict";e.r(n);var o=e("4da7"),u=e("d7ec");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("6872");var i,a=e("f0c5"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"4e1076d8",null,!1,o["a"],i);n["default"]=r.exports},d7ec:function(t,n,e){"use strict";e.r(n);var o=e("8584"),u=e.n(o);for(var c in o)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(c);n["default"]=u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/screenPopup-create-component',
     {

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

@@ -1 +1 @@
-.top-tab-search.data-v-dda31df0{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-dda31df0{display:flex;align-items:center}.top-tab-search .search .screen.data-v-dda31df0{display:flex;align-items:center;font-size:26rpx;color:#f83224;font-weight:600;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-dda31df0{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-dda31df0{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-dda31df0{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-dda31df0{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-dda31df0::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.top-tab-search .btn-list.data-v-dda31df0{display:flex;justify-content:space-around;align-items:center;margin-top:32rpx}.top-tab-search .btn-list view.data-v-dda31df0{width:210rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f3f3f3;border-radius:10rpx;font-size:26rpx;color:#444}.top-tab-search .btn-list .select-tab.data-v-dda31df0{background-color:rgba(248,50,36,.1);color:#f83224;font-weight:600}.top-tab-search .reset-config.data-v-dda31df0{display:flex;justify-content:space-between;align-items:center;margin-top:44rpx}.top-tab-search .reset-config .reset.data-v-dda31df0{width:260rpx;height:76rpx;background-color:#f3f3f3;border:none;border-radius:38rpx;color:#333;font-size:28rpx}.top-tab-search .reset-config .config.data-v-dda31df0{width:402rpx;height:76rpx;background-color:#f83224;color:#fff;border:none;border-radius:38rpx;font-size:28rpx}
+.top-tab-search.data-v-4e1076d8{background-color:#fff;padding:10rpx 24rpx;z-index:20174}.top-tab-search .search.data-v-4e1076d8{display:flex;align-items:center}.top-tab-search .search .screen.data-v-4e1076d8{display:flex;align-items:center;font-size:26rpx;color:#f83224;font-weight:600;margin-left:20rpx}.top-tab-search .search .screen .screen-icon.data-v-4e1076d8{width:24rpx;height:24rpx;margin-left:5rpx}.top-tab-search .top-tab.data-v-4e1076d8{margin-top:10rpx;padding:0 20rpx;display:flex;justify-content:space-between}.top-tab-search .top-tab .tab.data-v-4e1076d8{font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end;padding-bottom:12rpx}.top-tab-search .top-tab .commodity.data-v-4e1076d8{position:relative;font-weight:600}.top-tab-search .top-tab .commodity.data-v-4e1076d8::before{content:"";display:block;height:4rpx;width:50%;background:#f83224;position:absolute;bottom:-10rpx;opacity:.8;left:50%;-webkit-transform:translate(-50%,50%);transform:translate(-50%,50%)}.top-tab-search .btn-list.data-v-4e1076d8{display:flex;justify-content:space-around;align-items:center;margin-top:32rpx}.top-tab-search .btn-list view.data-v-4e1076d8{width:210rpx;height:68rpx;text-align:center;line-height:68rpx;background-color:#f3f3f3;border-radius:10rpx;font-size:26rpx;color:#444}.top-tab-search .btn-list .select-tab.data-v-4e1076d8{background-color:rgba(248,50,36,.1);color:#f83224;font-weight:600}.top-tab-search .reset-config.data-v-4e1076d8{display:flex;justify-content:space-between;align-items:center;margin-top:44rpx}.top-tab-search .reset-config .reset.data-v-4e1076d8{width:260rpx;height:76rpx;background-color:#f3f3f3;border:none;border-radius:38rpx;color:#333;font-size:28rpx}.top-tab-search .reset-config .config.data-v-4e1076d8{width:402rpx;height:76rpx;background-color:#f83224;color:#fff;border:none;border-radius:38rpx;font-size:28rpx}

unpackage/dist/build/mp-weixin/pageD/platformProducts/platformProducts.wxml

@@ -1 +1 @@
-<view class="page data-v-2a0f456d"><u--input style="background:#f4f4f4;" vue-id="71cabe6f-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{keyword}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-2a0f456d" bind:__l="__l"></u--input><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="content-list data-v-2a0f456d"><goods-information vue-id="{{'71cabe6f-2-'+__i0__}}" status="1" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" class="data-v-2a0f456d" bind:__l="__l"></goods-information></view></block></view>
+<view class="page data-v-46b260c1"><u--input style="background:#f4f4f4;" vue-id="71cabe6f-1" placeholder="{{i18n.searchGoods}}" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{keyword}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-46b260c1" bind:__l="__l"></u--input><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="content-list data-v-46b260c1"><goods-information vue-id="{{'71cabe6f-2-'+__i0__}}" status="1" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" class="data-v-46b260c1" bind:__l="__l"></goods-information></view></block></view>

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

@@ -1 +1 @@
-.page.data-v-2a0f456d{background-color:#fff;padding:20rpx 24rpx}.page .content-list.data-v-2a0f456d{margin-top:20rpx}.page.data-v-2a0f456d  .u-input{background-color:#f4f4f4}
+.page.data-v-46b260c1{background-color:#fff;padding:20rpx 24rpx}.page .content-list.data-v-46b260c1{margin-top:20rpx}.page.data-v-46b260c1  .u-input{background-color:#f4f4f4}

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/pageD/afterSalesDetail/component/applicationInformation.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{1389:function(n,e,t){"use strict";t.r(e);var r=t(1390),u=t(1392);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1394);var a,i=t(37),c=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6fe10644",null,!1,r["components"],a);c.options.__file="pageD/afterSalesDetail/component/applicationInformation.vue",e["default"]=c.exports},1390:function(n,e,t){"use strict";t.r(e);var r=t(1391);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1391:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,a=[];u._withStripped=!0},1392:function(n,e,t){"use strict";t.r(e);var r=t(1393),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1393:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};e.default=r},1394:function(n,e,t){"use strict";t.r(e);var r=t(1395),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1395:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{1391:function(n,e,t){"use strict";t.r(e);var r=t(1392),u=t(1394);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1396);var a,i=t(37),c=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6fe10644",null,!1,r["components"],a);c.options.__file="pageD/afterSalesDetail/component/applicationInformation.vue",e["default"]=c.exports},1392:function(n,e,t){"use strict";t.r(e);var r=t(1393);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1393:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,a=[];u._withStripped=!0},1394:function(n,e,t){"use strict";t.r(e);var r=t(1395),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1395:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};e.default=r},1396:function(n,e,t){"use strict";t.r(e);var r=t(1397),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1397:function(n,e,t){}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/applicationInformation-create-component',
     {
         'pageD/afterSalesDetail/component/applicationInformation-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1389))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1391))
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
         })
     },
     [['pageD/afterSalesDetail/component/applicationInformation-create-component']]

unpackage/dist/dev/mp-weixin/pageD/components/selectExpress.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/selectExpress"],{1396:function(e,n,t){"use strict";t.r(n);var r=t(1397),u=t(1399);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1401);var o,f=t(37),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"249ccb63",null,!1,r["components"],o);i.options.__file="pageD/components/selectExpress.vue",n["default"]=i.exports},1397:function(e,n,t){"use strict";t.r(n);var r=t(1398);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1398:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return o})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c},c=!1,o=[];u._withStripped=!0},1399:function(e,n,t){"use strict";t.r(n);var r=t(1400),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1400:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={name:"selectExpress",props:{show:{typeof:Boolean,default:!1},filterList:{typeof:Array,default:function(){return{}}},className:{typeof:String,default:""}}};n.default=r},1401:function(e,n,t){"use strict";t.r(n);var r=t(1402),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1402:function(e,n,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/selectExpress"],{1398:function(e,n,t){"use strict";t.r(n);var r=t(1399),u=t(1401);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1403);var o,f=t(37),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"249ccb63",null,!1,r["components"],o);i.options.__file="pageD/components/selectExpress.vue",n["default"]=i.exports},1399:function(e,n,t){"use strict";t.r(n);var r=t(1400);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1400:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return o})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c},c=!1,o=[];u._withStripped=!0},1401:function(e,n,t){"use strict";t.r(n);var r=t(1402),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1402:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={name:"selectExpress",props:{show:{typeof:Boolean,default:!1},filterList:{typeof:Array,default:function(){return{}}},className:{typeof:String,default:""}}};n.default=r},1403:function(e,n,t){"use strict";t.r(n);var r=t(1404),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1404:function(e,n,t){}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pageD/components/selectExpress.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/selectExpress-create-component',
     {
         'pageD/components/selectExpress-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1396))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1398))
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
         })
     },
     [['pageD/components/selectExpress-create-component']]

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

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{1403:function(n,e,t){"use strict";t.r(e);var r=t(1404),o=t(1406);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(1408);var c,i=t(37),a=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"c698a5ca",null,!1,r["components"],c);a.options.__file="pageD/homepage/component/goodsCard.vue",e["default"]=a.exports},1404:function(n,e,t){"use strict";t.r(e);var r=t(1405);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1405:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var o=function(){var n=this,e=n.$createElement,t=(n._self._c,n.itemInfo.goods.price.split(".")),r=n.itemInfo.goods.price.split(".");n.$mp.data=Object.assign({},{$root:{g0:t,g1:r}})},u=!1,c=[];o._withStripped=!0},1406:function(n,e,t){"use strict";t.r(e);var r=t(1407),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},1407:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{typeof:Object,default:function(){return{}}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{}}};e.default=r},1408:function(n,e,t){"use strict";t.r(e);var r=t(1409),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},1409:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{1405:function(n,e,t){"use strict";t.r(e);var r=t(1406),o=t(1408);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(1410);var c,i=t(37),a=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"c698a5ca",null,!1,r["components"],c);a.options.__file="pageD/homepage/component/goodsCard.vue",e["default"]=a.exports},1406:function(n,e,t){"use strict";t.r(e);var r=t(1407);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1407:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var o=function(){var n=this,e=n.$createElement,t=(n._self._c,n.itemInfo.goods.price.split(".")),r=n.itemInfo.goods.price.split(".");n.$mp.data=Object.assign({},{$root:{g0:t,g1:r}})},u=!1,c=[];o._withStripped=!0},1408:function(n,e,t){"use strict";t.r(e);var r=t(1409),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},1409:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{typeof:Object,default:function(){return{}}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{}}};e.default=r},1410:function(n,e,t){"use strict";t.r(e);var r=t(1411),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},1411:function(n,e,t){}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/homepage/component/goodsCard.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/homepage/component/goodsCard-create-component',
     {
         'pageD/homepage/component/goodsCard-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1403))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1405))
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
         })
     },
     [['pageD/homepage/component/goodsCard-create-component']]

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

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{1417:function(n,e,t){"use strict";t.r(e);var r=t(1418),u=t(1420);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1422);var c,i=t(37),d=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"4ed8fbfe",null,!1,r["components"],c);d.options.__file="pageD/newBulitOrder/component/commodity.vue",e["default"]=d.exports},1418:function(n,e,t){"use strict";t.r(e);var r=t(1419);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1419:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,c=[];u._withStripped=!0},1420:function(n,e,t){"use strict";t.r(e);var r=t(1421),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1421:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=r},1422:function(n,e,t){"use strict";t.r(e);var r=t(1423),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1423:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{1419:function(n,e,t){"use strict";t.r(e);var r=t(1420),u=t(1422);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1424);var c,i=t(37),d=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"4ed8fbfe",null,!1,r["components"],c);d.options.__file="pageD/newBulitOrder/component/commodity.vue",e["default"]=d.exports},1420:function(n,e,t){"use strict";t.r(e);var r=t(1421);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1421:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,c=[];u._withStripped=!0},1422:function(n,e,t){"use strict";t.r(e);var r=t(1423),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1423:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=r},1424:function(n,e,t){"use strict";t.r(e);var r=t(1425),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1425:function(n,e,t){}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/newBulitOrder/component/commodity.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/commodity-create-component',
     {
         'pageD/newBulitOrder/component/commodity-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1417))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1419))
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
         })
     },
     [['pageD/newBulitOrder/component/commodity-create-component']]

unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--input/u--input"],{993:function(n,e,t){"use strict";t.r(e);var u=t(994),r=t(996);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var c,o=t(37),f=Object(o["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],c);f.options.__file="uview-ui/components/u--input/u--input.vue",e["default"]=f.exports},994:function(n,e,t){"use strict";t.r(e);var u=t(995);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},995:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,c=[];r._withStripped=!0},996:function(n,e,t){"use strict";t.r(e);var u=t(997),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},997:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(998)),i=function(){t.e("uview-ui/components/u-input/u-input").then(function(){return resolve(t(1516))}.bind(null,t)).catch(t.oe)},c={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=c}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--input/u--input"],{1e3:function(n,e,t){"use strict";t.r(e);var u=t(1001),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},1001:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(1002)),i=function(){t.e("uview-ui/components/u-input/u-input").then(function(){return resolve(t(1518))}.bind(null,t)).catch(t.oe)},c={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=c}).call(this,t(2)["default"])},997:function(n,e,t){"use strict";t.r(e);var u=t(998),r=t(1e3);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var c,o=t(37),f=Object(o["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],c);f.options.__file="uview-ui/components/u--input/u--input.vue",e["default"]=f.exports},998:function(n,e,t){"use strict";t.r(e);var u=t(999);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},999:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,c=[];r._withStripped=!0}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--input/u--input.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--input/u--input-create-component',

unpackage/dist/dev/mp-weixin/uview-ui/components/u--text/u--text.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--text/u--text"],{1587:function(n,e,t){"use strict";t.r(e);var u=t(1588),r=t(1590);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);a.options.__file="uview-ui/components/u--text/u--text.vue",e["default"]=a.exports},1588:function(n,e,t){"use strict";t.r(e);var u=t(1589);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},1589:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c},i=!1,o=[];r._withStripped=!0},1590:function(n,e,t){"use strict";t.r(e);var u=t(1591),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},1591:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(1592)),i=function(){Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(1593))}.bind(null,t)).catch(t.oe)},o={name:"u--text",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvText:i}};e.default=o}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--text/u--text"],{1589:function(n,e,t){"use strict";t.r(e);var u=t(1590),r=t(1592);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);a.options.__file="uview-ui/components/u--text/u--text.vue",e["default"]=a.exports},1590:function(n,e,t){"use strict";t.r(e);var u=t(1591);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},1591:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c},i=!1,o=[];r._withStripped=!0},1592:function(n,e,t){"use strict";t.r(e);var u=t(1593),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},1593:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(1594)),i=function(){Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(1595))}.bind(null,t)).catch(t.oe)},o={name:"u--text",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvText:i}};e.default=o}).call(this,t(2)["default"])}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--text/u--text.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--text/u--text-create-component',
     {
         'uview-ui/components/u--text/u--text-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1587))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1589))
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
         })
     },
     [['uview-ui/components/u--text/u--text-create-component']]

unpackage/dist/dev/mp-weixin/uview-ui/components/u--textarea/u--textarea.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--textarea/u--textarea"],{1215:function(e,n,t){"use strict";t.r(n);var r=t(1216),u=t(1218);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);var c,o=t(37),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],c);a.options.__file="uview-ui/components/u--textarea/u--textarea.vue",n["default"]=a.exports},1216:function(e,n,t){"use strict";t.r(n);var r=t(1217);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1217:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$emit("focus")},e.e1=function(n){return e.$emit("blur")},e.e2=function(n){return e.$emit("linechange",n)},e.e3=function(n){return e.$emit("confirm")},e.e4=function(n){return e.$emit("input",n)},e.e5=function(n){return e.$emit("keyboardheightchange")})},i=!1,c=[];u._withStripped=!0},1218:function(e,n,t){"use strict";t.r(n);var r=t(1219),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(i);n["default"]=u.a},1219:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=r(t(1220)),i=function(){t.e("uview-ui/components/u-textarea/u-textarea").then(function(){return resolve(t(1564))}.bind(null,t)).catch(t.oe)},c={name:"u--textarea",mixins:[e.$u.mpMixin,u.default,e.$u.mixin],components:{uvTextarea:i}};n.default=c}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--textarea/u--textarea"],{1219:function(e,n,t){"use strict";t.r(n);var r=t(1220),u=t(1222);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);var c,o=t(37),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],c);a.options.__file="uview-ui/components/u--textarea/u--textarea.vue",n["default"]=a.exports},1220:function(e,n,t){"use strict";t.r(n);var r=t(1221);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1221:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$emit("focus")},e.e1=function(n){return e.$emit("blur")},e.e2=function(n){return e.$emit("linechange",n)},e.e3=function(n){return e.$emit("confirm")},e.e4=function(n){return e.$emit("input",n)},e.e5=function(n){return e.$emit("keyboardheightchange")})},i=!1,c=[];u._withStripped=!0},1222:function(e,n,t){"use strict";t.r(n);var r=t(1223),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(i);n["default"]=u.a},1223:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=r(t(1224)),i=function(){t.e("uview-ui/components/u-textarea/u-textarea").then(function(){return resolve(t(1566))}.bind(null,t)).catch(t.oe)},c={name:"u--textarea",mixins:[e.$u.mpMixin,u.default,e.$u.mixin],components:{uvTextarea:i}};n.default=c}).call(this,t(2)["default"])}}]);
+>>>>>>> 3498fc7da7e804be02c74f49182558a5ecebbe08
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--textarea/u--textarea.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--textarea/u--textarea-create-component',