冲突

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">{{
->>>>>>> 2494903d73ff7a5ceac2083482ba729e8041f111
                   item.is_discount == 0
                     ? item.discount_price.slice(0, -3)
                     : item.price.slice(0, -3)
@@ -496,7 +398,7 @@
             size="28"
           ></u-icon>
         </view>
-        <scroll-view :scroll-y="true" style="500rpx">
+        <scroll-view :scroll-y="true" style="500rpx">  
           <view
             class="transport"
             style="margin-top: 32rpx"

pageB/recipientinfo.vue

@@ -178,14 +178,6 @@
 						// this.$router.back();
 					});
 				}
-
-				uni.$u.http.post(`/api/address`, obj).then((res) => {
-					const eventchannel = this.getOpenerEventChannel();
-					eventchannel.emit('bottomadd', res)
-					uni.navigateBack()
-					// console.log(res);
-					// this.$router.back();
-				});
 			},
 			//选择省市区
 			countrycConfirm(e) {

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

@@ -1 +1 @@
-.titl.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#444;line-height:42rpx;text-align:left;font-style:normal;width:400rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.box.data-v-81a82ea4{width:750rpx;height:1266rpx;background:#f4f4f4;border-radius:24rpx 24rpx 0rpx 0rpx;margin-top:36rpx;padding:32rpx;box-sizing:border-box}.box .baoyou.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fff;line-height:28rpx;text-align:left;font-style:normal}.box .textone.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.box .texttwo.data-v-81a82ea4{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .textfour.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .backimg.data-v-81a82ea4{width:418rpx;height:68rpx}.box .item.data-v-81a82ea4{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-81a82ea4{padding:0 8rpx;height:32rpx;border-radius:4rpx;border:1rpx solid #e5bc78;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#d48700;line-height:28rpx;text-align:center;font-style:normal}.input.data-v-81a82ea4{width:458rpx;height:64rpx;background:#fdfcfb;border-radius:36rpx;padding:0 24rpx;box-sizing:border-box;margin-left:16rpx;display:flex;align-items:center}.biaopqian.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#fff;line-height:34rpx;text-align:left;font-style:normal}
+.titl.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#444;line-height:42rpx;text-align:left;font-style:normal;width:400rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.box.data-v-87a9d168{width:750rpx;height:1266rpx;background:#f4f4f4;border-radius:24rpx 24rpx 0rpx 0rpx;margin-top:36rpx;padding:32rpx;box-sizing:border-box}.box .baoyou.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fff;line-height:28rpx;text-align:left;font-style:normal}.box .textone.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.box .texttwo.data-v-87a9d168{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .textfour.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .backimg.data-v-87a9d168{width:418rpx;height:68rpx}.box .item.data-v-87a9d168{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-87a9d168{padding:0 8rpx;height:32rpx;border-radius:4rpx;border:1rpx solid #e5bc78;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#d48700;line-height:28rpx;text-align:center;font-style:normal}.input.data-v-87a9d168{width:458rpx;height:64rpx;background:#fdfcfb;border-radius:36rpx;padding:0 24rpx;box-sizing:border-box;margin-left:16rpx;display:flex;align-items:center}.biaopqian.data-v-87a9d168{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#fff;line-height:34rpx;text-align:left;font-style:normal}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"0b93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},"2b77":function(n,t,e){"use strict";e.r(t);var u=e("8416"),o=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=o.a},4201:function(n,t,e){},"7f709":function(n,t,e){"use strict";var u=e("4201"),o=e.n(u);o.a},8416:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}};t.default=u},aa81:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var o=u(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c805:function(n,t,e){"use strict";e.r(t);var u=e("0b93"),o=e("2b77");for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e("7f709");var a,i=e("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"0b93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},"2b77":function(n,t,e){"use strict";e.r(t);var u=e("8416"),o=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=o.a},4201:function(n,t,e){},"7f70":function(n,t,e){"use strict";var u=e("4201"),o=e.n(u);o.a},8416:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}};t.default=u},aa81:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var o=u(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c805:function(n,t,e){"use strict";e.r(t);var u=e("0b93"),o=e("2b77");for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e("7f70");var a,i=e("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"0896":function(n,t,o){"use strict";var e=o("5bd7"),r=o.n(e);r.a},"2c7c":function(n,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e=function(){o.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(o("ac58"))}.bind(null,o)).catch(o.oe)},r={components:{textRight:e},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},"5bd7":function(n,t,o){},"9b65":function(n,t,o){"use strict";o.r(t);var e=o("2c7c"),r=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(n){o.d(t,n,(function(){return e[n]}))}(i);t["default"]=r.a},b4ed:function(n,t,o){"use strict";o.r(t);var e=o("fb94"),r=o("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){o.d(t,n,(function(){return r[n]}))}(i);o("0896");var u,c=o("f0c5"),a=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,"79d48033",null,!1,e["a"],u);t["default"]=a.exports},fb94:function(n,t,o){"use strict";o.d(t,"b",(function(){return r})),o.d(t,"c",(function(){return i})),o.d(t,"a",(function(){return e}));var e={uTransition:function(){return Promise.all([o.e("common/vendor"),o.e("uview-ui/components/u-transition/u-transition")]).then(o.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,o=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,o){var e=n.__get_orig(t),r=t.goods.price.split("."),i=t.goods.price.split(".");return{$orig:e,g0:r,g1:i}})):null),e=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:o,g2:e,g3:r}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{1796:function(t,n,e){"use strict";var o=e("a82b"),r=e.n(o);r.a},"2c7c":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.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(t){}},methods:{more:function(){this.show=!this.show}}};n.default=r},"9b65":function(t,n,e){"use strict";e.r(n);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=r.a},a82b:function(t,n,e){},b4ed:function(t,n,e){"use strict";e.r(n);var o=e("cbf0"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(i);e("1796");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"05597344",null,!1,o["a"],u);n["default"]=a.exports},cbf0:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return i})),e.d(n,"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 t=this,n=t.$createElement,e=(t._self._c,t.itemInfo.order?t.__map(t.itemInfo.order_goods,(function(n,e){var o=t.__get_orig(n),r=n.sku_item?n.sku_item.price.split("."):null,i=n.sku_item?n.sku_item.price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=t.itemInfo.order?t.itemInfo.order.amount.split("."):null,r=t.itemInfo.order?t.itemInfo.order.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,e,n){"use strict";n.r(e);var o=n("de3d"),u=n("a76f");for(var f in u)["default"].indexOf(f)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(f);n("6c83");var r,a=n("f0c5"),c=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,"c6b37ca4",null,!1,o["a"],r);e["default"]=c.exports},"67aa":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};e.default=o},"6c83":function(t,e,n){"use strict";var o=n("ee3c"),u=n.n(o);u.a},a76f:function(t,e,n){"use strict";n.r(e);var o=n("67aa"),u=n.n(o);for(var f in o)["default"].indexOf(f)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(f);e["default"]=u.a},de3d:function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return f})),n.d(e,"a",(function(){return o}));var u=function(){var t=this,e=t.$createElement;t._self._c},f=[]},ee3c:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("56e4"),u=e("a76f");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("3c34");var r,f=e("f0c5"),i=Object(f["a"])(u["default"],o["b"],o["c"],!1,null,"ac422692",null,!1,o["a"],r);n["default"]=i.exports},"3c34":function(t,n,e){"use strict";var o=e("aaa4"),u=e.n(o);u.a},"56e4":function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(Number(t.countGoodsInformation.unit_price)*(t.goodsWeight*t.goodsValue)).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},a=[]},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},aaa4:function(t,n,e){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/goodsInformation-create-component',
     {

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

@@ -1 +1 @@
-<view class="list data-v-c6b37ca4"><view class="abount data-v-c6b37ca4" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-c6b37ca4" style="margin-bottom:40rpx;"><view class="name data-v-c6b37ca4">{{i18n.Commodityamount}}</view><view class="money data-v-c6b37ca4">{{'¥'+goodsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-c6b37ca4"><view class="name data-v-c6b37ca4">{{i18n.Grosscommodityweight}}</view><view class="money data-v-c6b37ca4">{{goodsWeight*goodsValue+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-c6b37ca4"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-c6b37ca4"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-c6b37ca4">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-c6b37ca4" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-c6b37ca4">{{i18n.Costperkilogram}}</view><view class="money data-v-c6b37ca4">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-c6b37ca4"><view class="name data-v-c6b37ca4">{{i18n.freight}}</view><view class="money data-v-c6b37ca4">{{containname?countGoodsInformation.sum:i18n.shippingmethod}}</view></view><view class="zong u-flex u-row-right data-v-c6b37ca4"><view class="data-v-c6b37ca4"><text class="small data-v-c6b37ca4">{{i18n.subtotal}}</text><text class="mon data-v-c6b37ca4">¥</text><text class="mon data-v-c6b37ca4" style="font-size:40rpx;">{{goodsPrice}}</text></view></view></view></view>
+<view class="list data-v-ac422692"><view class="abount data-v-ac422692" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-ac422692" style="margin-bottom:40rpx;"><view class="name data-v-ac422692">{{i18n.Commodityamount}}</view><view class="money data-v-ac422692">{{'¥'+specificationsPrice*goodsValue+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-ac422692"><view class="name data-v-ac422692">{{i18n.Grosscommodityweight}}</view><view class="money data-v-ac422692">{{goodsWeight*goodsValue+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-ac422692"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-ac422692"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-ac422692">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-ac422692" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-ac422692">{{i18n.Costperkilogram}}</view><view class="money data-v-ac422692">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-ac422692"><view class="name data-v-ac422692">{{i18n.freight}}</view><view class="money data-v-ac422692">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-ac422692"><view class="data-v-ac422692"><text class="small data-v-ac422692">{{i18n.subtotal}}</text><text class="mon data-v-ac422692">¥</text><text class="mon data-v-ac422692" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>

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

@@ -1 +1 @@
-.list .abount.data-v-c6b37ca4{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-c6b37ca4{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-c6b37ca4{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-c6b37ca4{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-c6b37ca4{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-c6b37ca4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-c6b37ca4{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}
+.list .abount.data-v-ac422692{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-ac422692{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-ac422692{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-ac422692{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-ac422692{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-ac422692{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-ac422692{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}

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

@@ -1 +1 @@
-.poptitle.data-v-6cdff688{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-6cdff688{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-6cdff688{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-6cdff688{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-6cdff688{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-6cdff688{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-6cdff688{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-6cdff688{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}
+.poptitle.data-v-1c97f771{width:142rpx;height:50rpx;font-family:PingFangSC,PingFang SC;font-weight:600;font-size:36rpx;color:#333;text-align:center;width:100%}.transport.data-v-1c97f771{width:702rpx;height:164rpx;background:#fff;border-radius:12rpx;padding:24rpx 20rpx;box-sizing:border-box}.yundate.data-v-1c97f771{font-family:PingFangSC,PingFang SC;font-weight:550;font-size:32rpx;color:#333;line-height:44rpx;text-align:left;font-style:normal}.chest.data-v-1c97f771{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal}.mone.data-v-1c97f771{font-family:JDZhengHT;font-weight:400;font-size:26rpx;color:#f83224;line-height:32rpx;text-align:left;font-style:normal}.enbottom.data-v-1c97f771{width:750rpx;height:166rpx;background:#fff;position:absolute;left:0rpx;bottom:0;padding:0 24rpx;box-sizing:border-box}.enbottom .confirm.data-v-1c97f771{width:398rpx;height:84rpx;background:#f83224;border-radius:42rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.enbottom .cancel.data-v-1c97f771{width:280rpx;height:84rpx;border-radius:42rpx;border:2rpx solid hsla(0,0%,59.2%,.3);font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#444;line-height:84rpx;text-align:center;font-style:normal}

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

@@ -1 +1 @@
-.page.data-v-316f2cc8{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-316f2cc8{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-316f2cc8{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-316f2cc8{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-316f2cc8{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-316f2cc8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-316f2cc8{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-316f2cc8{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-316f2cc8{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-316f2cc8{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.page.data-v-b5194430{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-b5194430{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-b5194430{font-family:SFPro;font-weight:500;font-size:32rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal}.page .address .info.data-v-b5194430{font-family:SFPro;font-weight:400;font-size:24rpx;color:#555;line-height:28rpx;text-align:left;font-style:normal;margin-top:20rpx}.page .logistics.data-v-b5194430{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-b5194430{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#f83224;line-height:40rpx;text-align:left;font-style:normal;margin-right:8rpx}.page .btn.data-v-b5194430{width:750rpx;height:166rpx;background:#fff;box-shadow:0rpx -1rpx 0rpx 0rpx rgba(0,0,0,.05);position:fixed;bottom:0;left:0;padding:0 24rpx 5rpx 5rpx;box-sizing:border-box}.page .btn .money.data-v-b5194430{font-family:HarmonyOS_Sans_Medium;font-size:48rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;font-weight:700}.page .btn .kg.data-v-b5194430{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;line-height:34rpx;text-align:left;font-style:normal}.page .btn .order.data-v-b5194430{width:232rpx;height:80rpx;background:#f83224;border-radius:40rpx;font-family:PingFangTC;font-weight:500;font-size:32rpx;color:#fff;line-height:80rpx;text-align:center;font-style:normal;margin-left:20rpx}

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

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

unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxss

@@ -1 +1 @@
-.content.data-v-40df6646{width:750rpx;min-height:calc(100vh - 40rpx);background:linear-gradient(180deg,#fdfcfb,#f4f4f4);border-radius:30rpx 30rpx 0rpx 0rpx;margin-top:32rpx;padding:32rpx;box-sizing:border-box}.content .item.data-v-40df6646{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-40df6646{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal;display:block;width:100%;height:70rpx;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all}.content .item .tabsa.data-v-40df6646{margin-top:10rpx;border-radius:4rpx;border:1rpx solid #ed0909;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#ed0909;text-align:center;font-style:normal;display:inline;padding:0 4rpx;box-sizing:border-box}.content .item .num.data-v-40df6646{font-family:SFPro;font-weight:400;font-size:20rpx;color:#555;line-height:24rpx;text-align:left;font-style:normal;margin-top:16rpx}.content .item .money.data-v-40df6646{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-40df6646{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-40df6646{width:702rpx;height:68rpx;background:#fff;border-radius:34rpx;margin-left:24rpx;box-sizing:border-box;padding:0 8rpx 0 24rpx}.input .search.data-v-40df6646{width:100rpx;height:56rpx;background:#f83224;border-radius:28rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#fff;line-height:56rpx;text-align:center;font-style:normal}
+.content.data-v-7a199b10{width:750rpx;min-height:calc(100vh - 40rpx);background:linear-gradient(180deg,#fdfcfb,#f4f4f4);border-radius:30rpx 30rpx 0rpx 0rpx;margin-top:32rpx;padding:32rpx;box-sizing:border-box}.content .item.data-v-7a199b10{width:340rpx;background:#fff;border-radius:16rpx}.content .item .title.data-v-7a199b10{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#222;line-height:36rpx;text-align:left;font-style:normal;display:block;width:100%;height:70rpx;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:2;display:-webkit-box;-webkit-box-orient:vertical;word-break:break-all}.content .item .tabsa.data-v-7a199b10{margin-top:10rpx;border-radius:4rpx;border:1rpx solid #ed0909;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#ed0909;text-align:center;font-style:normal;display:inline;padding:0 4rpx;box-sizing:border-box}.content .item .num.data-v-7a199b10{font-family:SFPro;font-weight:400;font-size:20rpx;color:#555;line-height:24rpx;text-align:left;font-style:normal;margin-top:16rpx}.content .item .money.data-v-7a199b10{font-family:HarmonyOS_Sans_Medium;font-size:20rpx;color:#f83224;line-height:26rpx;text-align:left;font-style:normal}.back.data-v-7a199b10{position:absolute;top:0;left:0;width:750rpx;height:800rpx;background:#fe2e2e}.input.data-v-7a199b10{width:702rpx;height:68rpx;background:#fff;border-radius:34rpx;margin-left:24rpx;box-sizing:border-box;padding:0 8rpx 0 24rpx}.input .search.data-v-7a199b10{width:100rpx;height:56rpx;background:#f83224;border-radius:28rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#fff;line-height:56rpx;text-align:center;font-style:normal}

unpackage/dist/build/mp-weixin/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": true,
+    "minified": false,
     "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"
   }
 }

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>