mabaoyi il y a 7 mois
Parent
commit
2494903d73
100 fichiers modifiés avec 223 ajouts et 67 suppressions
  1. 17 5
      commont/messages.js
  2. 87 26
      pageA/order.vue
  3. BIN
      pageA/static/images/Free1.png
  4. BIN
      pageA/static/images/Free2.png
  5. BIN
      pageA/static/images/Free3.png
  6. BIN
      pageA/static/images/Million.png
  7. BIN
      pageA/static/images/Millones1.png
  8. BIN
      pageA/static/images/Millones2.png
  9. BIN
      pageA/static/images/kg1.png
  10. BIN
      pageA/static/images/kg2.png
  11. BIN
      pageA/static/images/kg3.png
  12. BIN
      pageA/static/images/recommend1.png
  13. BIN
      pageA/static/images/recommend2.png
  14. BIN
      pageA/static/images/recommend3.png
  15. 24 3
      pageA/subsidy.vue
  16. 5 2
      pages/express/express.vue
  17. 63 14
      pages/index/index.vue
  18. 12 2
      pages/shopping/shopping.vue
  19. BIN
      static/express/label1.png
  20. BIN
      static/express/label2.png
  21. BIN
      static/express/label3.png
  22. BIN
      static/images/index/butie1.png
  23. BIN
      static/images/index/butie2.png
  24. BIN
      static/images/index/butie3.png
  25. BIN
      static/images/index/pinbao1.png
  26. BIN
      static/images/index/pinbao2.png
  27. BIN
      static/images/index/pinbao3.png
  28. BIN
      static/images/index/postage1.png
  29. BIN
      static/images/index/postage2.png
  30. BIN
      static/images/index/postage3.png
  31. BIN
      static/shopping/shop1.png
  32. BIN
      static/shopping/shop2.png
  33. BIN
      static/shopping/shop3.png
  34. BIN
      static/shopping/title2.png
  35. BIN
      static/shopping/title3.png
  36. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.js
  38. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.wxml
  39. 1 1
      unpackage/dist/build/mp-weixin/pageA/changelange.wxss
  40. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  41. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  42. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  43. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  44. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  45. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  46. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  47. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  48. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  49. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  50. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  51. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxss
  52. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  53. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  54. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.js
  55. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxml
  56. 1 1
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxss
  57. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js
  58. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml
  59. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxss
  60. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.js
  61. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.wxml
  62. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.wxss
  63. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  64. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  65. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxss
  66. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.js
  67. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.wxml
  68. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.wxss
  69. 0 0
      unpackage/dist/build/mp-weixin/pageB/list/list.js
  70. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  71. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml
  72. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss
  73. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.js
  74. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.wxml
  75. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.wxss
  76. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.js
  77. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml
  78. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.js
  79. 0 0
      unpackage/dist/build/mp-weixin/pageB/search.wxml
  80. 1 1
      unpackage/dist/build/mp-weixin/pageB/search.wxss
  81. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js
  82. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxml
  83. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxss
  84. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.js
  85. 1 1
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxml
  86. 1 1
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxss
  87. 1 1
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js
  88. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxml
  89. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxss
  90. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js
  91. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml
  92. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss
  93. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js
  94. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxml
  95. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxss
  96. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js
  97. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml
  98. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss
  99. 0 0
      unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.js
  100. 0 0
      unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml

+ 17 - 5
commont/messages.js

@@ -347,6 +347,9 @@ export default {
 			successfullydelete:'删除成功',
 			defaultTheme:'默认主题',
 			and:'和',
+			lowest:'低至',
+			discount:'折扣',
+			newcontainer:'请重新选择货柜'
 		},
 	},
 	//英语
@@ -688,7 +691,10 @@ export default {
 			Shiftfocus: 'Shift to focus',
 			successfullydelete: 'Deleted successfully',
 			defaultTheme: 'Default theme',
-			and:'and'
+			and:'and',
+			lowest:'lowest',
+			discount:'discount',
+			newcontainer:'Please select a new container'
 		},
 	},
 	// 西班牙
@@ -1012,7 +1018,10 @@ export default {
 			Shiftfocus: 'Mover el enfoque',
 			successfullydelete: 'Eliminado con éxito',
 			defaultTheme: 'Tema predeterminado',
-			and:'y'
+			and:'y',
+			lowest:'mínimo',
+			discount:'descuento',
+			newcontainer:'Por favor, vuelva a seleccionar contenedor'
 		},
 	},
 	//意大利
@@ -1104,8 +1113,8 @@ export default {
 			mine: "La mia",
 			addsign: "Aggiungere i pacchi ai punti di transito",
 			more: "più",
-			price: "Prezzo unitario",
-			already: "Ha scritto",
+			price: "Prezzo",
+			already: "scritto",
 			parcel: "pacchi",
 			residue: "residuo",
 			plan: "processo ",
@@ -1351,7 +1360,10 @@ export default {
 			Shiftfocus: 'Sposta la attenzione',
 			successfullydelete: 'Eliminato con successo',
 			defaultTheme: 'Tema predefinito',
-			and:'e'
+			and:'e',
+			lowest:'minimo',
+			discount:'sconti',
+			newcontainer:'Per favore riprendete il contenitore'
 		},
 	},
 };

+ 87 - 26
pageA/order.vue

@@ -40,7 +40,18 @@
             "
           >
             <view class="">
-              <text class="toptitle">{{ item.name_cn }}</text>
+              <text class="toptitle" v-if="language == 'zh-CN'">{{
+                item.name_cn
+              }}</text>
+              <text class="toptitle" v-if="language == 'en-US'">{{
+                item.name_en
+              }}</text>
+              <text class="toptitle" v-if="language == 'es-ES'">{{
+                item.name_es
+              }}</text>
+              <text class="toptitle" v-if="language == 'it-IT'">{{
+                item.name_ita
+              }}</text>
               <view class="weight">{{ item.sku_item[0].item }} </view>
             </view>
             <view class="u-flex u-row-between">
@@ -82,7 +93,18 @@
             "
           >
             <view class="">
-              <text class="toptitle">{{ goodinfo.name_cn }}</text>
+              <text class="toptitle" v-if="language == 'zh-CN'">{{
+                goodinfo.name_cn
+              }}</text>
+              <text class="toptitle" v-if="language == 'en-US'">{{
+                goodinfo.name_en
+              }}</text>
+              <text class="toptitle" v-if="language == 'es-ES'">{{
+                goodinfo.name_es
+              }}</text>
+              <text class="toptitle" v-if="language == 'it-IT'">{{
+                goodinfo.name_ita
+              }}</text>
               <view class="weight">{{ sku_info.item }} </view>
               <!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
             </view>
@@ -99,7 +121,7 @@
                       1000000
                 }}</text>
               </view>
-              <u-number-box v-model="value">
+              <u-number-box @change="valChange" v-model="value">
                 <view slot="minus" class="">
                   <u-icon name="minus" size="12"></u-icon>
                 </view>
@@ -121,7 +143,7 @@
     <!-- 物流 -->
     <view class="logistics u-flex u-row-between">
       <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
-      <view class="u-flex" @click="show = true">
+      <view class="u-flex" @click="changwu">
         <text class="change">{{
           containname1 ? type1 + " | " + containname1 : i18n.selection
         }}</text>
@@ -132,10 +154,32 @@
     <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
@@ -482,6 +526,7 @@ export default {
       stringcheck: "",
       cartid: "",
       weight_total: "",
+      valuenum: false,
     };
   },
   computed: {
@@ -492,6 +537,7 @@ export default {
   onLoad(options) {
     // url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
     if (options.typea) {
+      console.log(22222);
       this.typea = options.typea;
       this.selelist = JSON.parse(decodeURIComponent(options.selelist));
       this.goodsPrice = options.goodsPrice;
@@ -515,6 +561,16 @@ export default {
     // this.container()
   },
   methods: {
+    changwu() {
+      if (this.addinfo) {
+        this.show = true;
+      } else {
+        this.$u.toast(this.i18n.shippingaddress);
+      }
+    },
+    valChange() {
+      this.valuenum = true;
+    },
     todetail(id) {
       uni.navigateTo({
         url: "/pageA/productdetails?id=" + id,
@@ -751,6 +807,7 @@ export default {
     },
     //确定
     confirm() {
+      this.valuenum = false;
       this.show1 = false;
       this.containname1 = this.containname;
       this.recommendweight();
@@ -763,28 +820,32 @@ export default {
     },
     //提交订单
     topay() {
-      uni.$u.http
-        .post("/api/order", {
-          address_id: this.addinfo.id, //3	是	String	地址ID
-          goods_id: this.goodinfo.id, //65	是	String	商品id
-          goods_num: this.value, //2	是	String	商品数量
-          sku_item_id: this.sku_info.id, //60	是	String	规格id
-          cart_ids: this.stringcheck, //8,9	是	String	购物车id
-          remark: "", //备注	是	String	备注
-          merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
-          container_id: this.containid, //1	是	String	货柜id
-          share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
-          belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
-        })
-        .then((res) => {
-          console.log("share_merchant_id", this.share_merchant_id);
-          console.log(res);
-          uni.navigateTo({
-            // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
-            url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
-          });
-        })
-        .catch(() => {});
+      if (this.valuenum) {
+        this.$u.toast(this.i18n.newcontainer);
+      } else {
+        uni.$u.http
+          .post("/api/order", {
+            address_id: this.addinfo.id, //3	是	String	地址ID
+            goods_id: this.goodinfo.id, //65	是	String	商品id
+            goods_num: this.value, //2	是	String	商品数量
+            sku_item_id: this.sku_info.id, //60	是	String	规格id
+            cart_ids: this.stringcheck, //8,9	是	String	购物车id
+            remark: "", //备注	是	String	备注
+            merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
+            container_id: this.containid, //1	是	String	货柜id
+            share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
+            belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+          })
+          .then((res) => {
+            console.log("share_merchant_id", this.share_merchant_id);
+            console.log(res);
+            uni.navigateTo({
+              // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
+              url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
+            });
+          })
+          .catch(() => {});
+      }
     },
   },
 };

BIN
pageA/static/images/Free1.png


BIN
pageA/static/images/Free2.png


BIN
pageA/static/images/Free3.png


BIN
pageA/static/images/Million.png


BIN
pageA/static/images/Millones1.png


BIN
pageA/static/images/Millones2.png


BIN
pageA/static/images/kg1.png


BIN
pageA/static/images/kg2.png


BIN
pageA/static/images/kg3.png


BIN
pageA/static/images/recommend1.png


BIN
pageA/static/images/recommend2.png


BIN
pageA/static/images/recommend3.png


+ 24 - 3
pageA/subsidy.vue

@@ -14,9 +14,30 @@
 		</u-navbar>
 		<!-- 标签 -->
 		<view class=" u-row-center" style="margin-top: 52rpx;display: flex;flex-direction: column;align-items: center;">
-			<image v-if="show==1" src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image>
-			<image v-if="show==2" src="static/images/img2.png" style="width: 346rpx;height: 64rpx;" mode=""></image>
-			<image v-if="show==3" src="static/images/goshop.png" style="width: 382rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==1 && language =='zh-CN'" src="static/images/img1.png"
+				style="width: 484rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==1 && language =='en-US'" src="/pageA/static/images/Million.png"
+				style="width: 484rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==1 && language =='es-ES'" src="/pageA/static/images/Million.png1"
+				style="width: 484rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==1 && language =='it-IT'" src="/pageA/static/images/Million.png2"
+				style="width: 484rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==2 && language =='zh-CN'" src="static/images/img2.png"
+				style="width: 346rpx;height: 64rpx;" mode=""></image>
+			<image v-if="show==2 && language =='en-US'" src="/pageA/static/images/kg1.png"
+				style="width: 346rpx;height: 64rpx;" mode=""></image>
+			<image v-if="show==2 && language =='es-ES'" src="/pageA/static/images/kg2.png"
+				style="width: 346rpx;height: 64rpx;" mode=""></image>
+			<image v-if="show==2 && language =='it-IT'" src="/pageA/static/images/kg3.png"
+				style="width: 346rpx;height: 64rpx;" mode=""></image>
+			<image v-if="show==3 && language =='zh-CN'" src="static/images/goshop.png"
+				style="width: 382rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==3 && language =='en-US'" src="/pageA/static/images/Free1.png"
+				style="width: 382rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==3 && language =='es-ES'" src="/pageA/static/images/Free2.png"
+				style="width: 382rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==3 && language =='it-IT'" src="/pageA/static/images/Free3.png"
+				style="width: 382rpx;height: 52rpx;" mode=""></image>
 			<!-- 			<image src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image> -->
 			<view class="biaopqian" style="margin-top: 20rpx;">
 				<text>{{i18n.Goodgoods}}</text>

+ 5 - 2
pages/express/express.vue

@@ -172,7 +172,10 @@
 			<view class="u-flex u-row-between" style="margin-top: 32rpx;">
 				<view class="u-flex">
 					<text class="hai">{{i18n.parceling}}</text>
-					<image style="width: 180rpx;height: 32rpx;" src="/static/express/label.png" mode=""></image>
+					<image v-if="language =='zh-CN'" style="width: 180rpx;height: 32rpx;" src="/static/express/label.png" mode=""></image>
+					<image v-if="language =='en-US'" style="width: 264rpx;height: 32rpx;" src="/static/express/label1.png" mode=""></image>
+					<image v-if="language =='es-ES'" style="width: 264rpx;height: 32rpx;" src="/static/express/label2.png" mode=""></image>
+					<image v-if="language =='it-IT'" style="width: 264rpx;height: 32rpx;" src="/static/express/label3.png" mode=""></image>
 				</view>
 				<view class="u-flex">
 					<text class="more" @click="more">{{i18n.more}}</text>
@@ -180,7 +183,7 @@
 				</view>
 			</view>
 			<!-- 拼包数据 -->
-			<view class="label" v-for="(item,idx) in expressList" :key="idx">
+			<view class="label" v-for="(item,idx) in expressList" :key="idx">   
 				<view class="" style="display: flex;">
 					<view class="left flexc">
 						<text class="bourn">{{i18n.destination}}</text>

+ 63 - 14
pages/index/index.vue

@@ -58,7 +58,17 @@
 				<!-- 百亿补贴 -->
 				<view class="bigbox" @click="subsidy(1)">
 					<view class="u-flex">
-						<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;" mode="">
+						<image v-if="language=='zh-CN'" src="../../static/images/index/butie.png"
+							style="width: 104rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='en-US'" src="../../static/images/index/butie1.png"
+							style="width: 200rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='es-ES'" src="../../static/images/index/butie2.png"
+							style="width: 260rpx;height: 26rpx;" mode="">
+						</image>
+						<image v-if="language =='it-IT'" src="../../static/images/index/butie3.png"
+							style="width: 260rpx;height: 26rpx;" mode="">
 						</image>
 						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
 					</view>
@@ -90,9 +100,21 @@
 				<view class="">
 					<view class="smallbox" @click="subsidy(2)">
 						<view class="u-flex">
-							<image src="../../static/images/index/pinbao.png" style="width: 164rpx;height: 26rpx;"
-								mode=""></image>
-							<view class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.expensive}}
+							<image v-if="language=='zh-CN'" src="../../static/images/index/pinbao.png"
+								style="width: 164rpx;height: 26rpx;" mode=""></image>
+							<image v-if="language =='en-US'" src="../../static/images/index/pinbao1.png"
+								style="width: 200rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='es-ES'" src="../../static/images/index/pinbao2.png"
+								style="width: 126rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='it-IT'" src="../../static/images/index/pinbao3.png"
+								style="width: 126rpx;height: 26rpx;" mode="">
+							</image>
+							<view v-if="language=='zh-CN'" class="biaoqian" style="background: rgba(255, 148, 21, 1);">
+								{{i18n.lowest}}1元
+							</view>
+							<view v-else class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.lowest}}1RMB
 							</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
@@ -122,8 +144,17 @@
 					</view>
 					<view class="smallbox" @click="subsidy(3)">
 						<view class="u-flex">
-							<image src="../../static/images/index/postage.png" style="width: 116rpx;height: 26rpx;"
-								mode=""></image>
+							<image v-if="language =='zh-CN'" src="../../static/images/index/postage.png"
+								style="width: 116rpx;height: 26rpx;" mode=""></image>
+							<image v-if="language =='en-US'" src="../../static/images/index/postage1.png"
+								style="width: 130rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='es-ES'" src="../../static/images/index/postage2.png"
+								style="width: 200rpx;height: 26rpx;" mode="">
+							</image>
+							<image v-if="language =='it-IT'" src="../../static/images/index/postage3.png"
+								style="width: 190rpx;height: 26rpx;" mode="">
+							</image>
 							<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
@@ -151,10 +182,9 @@
 			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
 				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;"
 					@click="todetail(item.id)">
-					<image v-if="item.is_discount==0" src="../../static/images/index/discount.png"
-						style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;z-index: 10;"
-						mode="">
-					</image>
+					<view class="discount">
+						{{i18n.discount}}
+					</view>
 					<image :src="item.image"
 						style="width: 340rpx;height: 340rpx;;margin-left: -20rpx;margin-top: -18rpx;" mode=""></image>
 					<view class="title" v-if="language =='zh-CN'">
@@ -307,9 +337,9 @@
 			//获取快递列表
 			getlista() {
 				uni.$u.http.get('/api/express-company', {}).then((res) => {
-					uni.setStorageSync('radiolist1',res)
+					uni.setStorageSync('radiolist1', res)
 				}).catch(() => {
-			
+
 				})
 			},
 			HXlogin() {
@@ -326,7 +356,7 @@
 					}).catch(reason => {
 						console.log('失败', reason);
 					})
-			
+
 				}
 			},
 			getlist() {
@@ -540,6 +570,24 @@
 		background-color: rgba(0, 0, 0, 0)
 	}
 
+	.discount {
+		// width: 100rpx;
+		padding: 0 6rpx;
+		height: 36rpx;
+		background: #FF1515;
+		border-radius: 6rpx;
+		position: absolute;
+		left: 12rpx;
+		top: 12rpx;
+		z-index: 10;
+		font-family: OriyaMN;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		line-height: 36rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
 	.index-navbar {
 		position: sticky;
 		top: 0;
@@ -627,8 +675,9 @@
 		font-weight: 400;
 		font-size: 20rpx;
 		color: #FFFFFF;
-		line-height: 28rpx;
+		line-height: 30rpx;
 		text-align: center;
+		overflow: hidden;
 	}
 
 	.tag {

+ 12 - 2
pages/shopping/shopping.vue

@@ -7,7 +7,11 @@
 			<view class="u-nav-slot" slot="left">
 				<image v-if="language =='zh-CN'" src="../../static/shopping/title.png"
 					style="width: 390rpx;height: 48rpx;" mode=""></image>
-				<image v-else src="../../static/shopping/title1.png" style="width: 390rpx;height: 48rpx;" mode="">
+				<image v-if="language =='en-US'" src="/static/shopping/title1.png" style="width: 390rpx;height: 48rpx;" mode="">
+				</image>
+				<image v-if="language =='es-ES'" src="/static/shopping/title2.png" style="width: 390rpx;height: 48rpx;" mode="">
+				</image>
+				<image v-if="language =='it-IT'" src="/static/shopping/title3.png" style="width: 390rpx;height: 48rpx;" mode="">
 				</image>
 			</view>
 		</u-navbar>
@@ -81,7 +85,13 @@
 									<text class="money">¥</text>
 									<text class="money" style="font-size: 40rpx;">{{item.goods.discount_price}}</text>
 								</view>
-								<image src="../../static/shopping/shop.png" style="width: 82rpx;height: 38rpx;" mode="">
+								<image v-if="language =='zh-CN'" src="../../static/shopping/shop.png" style="width: 82rpx;height: 38rpx;" mode="">
+								</image>
+								<image v-if="language =='en-US'" src="/static/shopping/shop1.png" style="width: 100rpx;height: 38rpx;" mode="">
+								</image>
+								<image v-if="language =='es-ES'" src="/static/shopping/shop2.png" style="width: 70rpx;height: 38rpx;" mode="">
+								</image>
+								<image v-if="language =='it-IT'" src="/static/shopping/shop3.png" style="width: 100rpx;height: 38rpx;" mode="">
 								</image>
 							</view>
 						</view>

BIN
static/express/label1.png


BIN
static/express/label2.png


BIN
static/express/label3.png


BIN
static/images/index/butie1.png


BIN
static/images/index/butie2.png


BIN
static/images/index/butie3.png


BIN
static/images/index/pinbao1.png


BIN
static/images/index/pinbao2.png


BIN
static/images/index/pinbao3.png


BIN
static/images/index/postage1.png


BIN
static/images/index/postage2.png


BIN
static/images/index/postage3.png


BIN
static/shopping/shop1.png


BIN
static/shopping/shop2.png


BIN
static/shopping/shop3.png


BIN
static/shopping/title2.png


BIN
static/shopping/title3.png


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/changelange.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/changelange.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/changelange.wxss

@@ -1 +1 @@
-.page.data-v-7a66a0fc{padding:20rpx 24rpx;background-color:#fff!important;height:calc(100vh - 40rpx)}.page .btnleft.data-v-7a66a0fc{width:280rpx;height:88rpx;border-radius:48rpx;border:2rpx solid hsla(0,0%,59.2%,.4);line-height:88rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#333}.page .btnright.data-v-7a66a0fc{width:380rpx;height:88rpx;background:#f83224;border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.page .btn-list.data-v-7a66a0fc{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-7a66a0fc{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-7a66a0fc{width:36rpx;height:36rpx}
+.page.data-v-0d782a6c{padding:20rpx 24rpx;background-color:#fff!important;height:calc(100vh - 40rpx)}.page .btnleft.data-v-0d782a6c{width:280rpx;height:88rpx;border-radius:48rpx;border:2rpx solid hsla(0,0%,59.2%,.4);line-height:88rpx;text-align:center;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#333}.page .btnright.data-v-0d782a6c{width:380rpx;height:88rpx;background:#f83224;border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.page .btn-list.data-v-0d782a6c{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-0d782a6c{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-0d782a6c{width:36rpx;height:36rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-07bdf112{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-07bdf112{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-07bdf112{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-07bdf112{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-07bdf112{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-07bdf112{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-07bdf112{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-07bdf112{position:relative}.back .topbox .state.data-v-07bdf112{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-07bdf112{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-07bdf112{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-c84f241e{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-c84f241e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-c84f241e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-c84f241e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-c84f241e{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-c84f241e{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-c84f241e{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-c84f241e{position:relative}.back .topbox .state.data-v-c84f241e{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-c84f241e{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-c84f241e{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/service/service.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.wxml


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

@@ -1 +1 @@
-.titl.data-v-63482d8a{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-63482d8a{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-63482d8a{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-63482d8a{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-63482d8a{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-63482d8a{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-63482d8a{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-63482d8a{width:418rpx;height:68rpx}.box .item.data-v-63482d8a{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-63482d8a{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-63482d8a{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-63482d8a{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-6f271d12{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-6f271d12{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-6f271d12{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-6f271d12{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-6f271d12{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-6f271d12{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-6f271d12{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-6f271d12{width:418rpx;height:68rpx}.box .item.data-v-6f271d12{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-6f271d12{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-6f271d12{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-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#fff;line-height:34rpx;text-align:left;font-style:normal}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/list/list.js


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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"147a":function(n,e,t){},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5abc":function(n,e,t){"use strict";var r=t("147a"),o=t.n(r);o.a},8079:function(n,e,t){"use strict";t.r(e);var r=t("9789"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("5abc");var i,a=t("f0c5"),c=Object(a["a"])(o["default"],r["b"],r["c"],!1,null,"66b183e6",null,!1,r["a"],i);e["default"]=c.exports},9789:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"29cc":function(n,e,t){"use strict";var r=t("9b36"),o=t.n(r);o.a},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},8079:function(n,e,t){"use strict";t.r(e);var r=t("86be"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("29cc");var i,c=t("f0c5"),a=Object(c["a"])(o["default"],r["b"],r["c"],!1,null,"185ecc00",null,!1,r["a"],i);e["default"]=a.exports},"86be":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9b36":function(n,e,t){},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.myPackage+"-"+this.i18n.Vieworder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/express/express"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml

@@ -1 +1 @@
-<view class="back data-v-66b183e6"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-66b183e6" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-66b183e6"><text class="success data-v-66b183e6">{{i18n.successful}}</text><text class="sun data-v-66b183e6">{{i18n.pickpackage}}</text></view><view class="address data-v-66b183e6"><view style="margin-top:44rpx;" class="data-v-66b183e6"><view class="u-flex data-v-66b183e6"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-66b183e6"></image><text class="name data-v-66b183e6" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-66b183e6" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-66b183e6" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-66b183e6"><view class="u-flex data-v-66b183e6"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-66b183e6"></image><text class="name data-v-66b183e6" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-66b183e6" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-66b183e6" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-66b183e6"><view class="num data-v-66b183e6"><text class="num data-v-66b183e6">{{i18n.OrderNumber+":"}}</text><text class="num data-v-66b183e6">{{orderinfo.order_no}}</text></view><view class="num data-v-66b183e6" style="margin-top:50rpx;"><text class="num data-v-66b183e6">{{i18n.Ordertime+":"}}</text><text class="num data-v-66b183e6">{{orderinfo.created_at}}</text></view></view></view>
+<view class="back data-v-185ecc00"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-185ecc00" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-185ecc00"><text class="success data-v-185ecc00">{{i18n.successful}}</text><text class="sun data-v-185ecc00">{{i18n.pickpackage}}</text></view><view class="address data-v-185ecc00"><view style="margin-top:44rpx;" class="data-v-185ecc00"><view class="u-flex data-v-185ecc00"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-185ecc00"></image><text class="name data-v-185ecc00" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-185ecc00" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-185ecc00" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-185ecc00"><view class="u-flex data-v-185ecc00"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-185ecc00"></image><text class="name data-v-185ecc00" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-185ecc00" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-185ecc00" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-185ecc00"><view class="num data-v-185ecc00"><text class="num data-v-185ecc00">{{i18n.OrderNumber+":"}}</text><text class="num data-v-185ecc00">{{orderinfo.order_no}}</text></view><view class="num data-v-185ecc00" style="margin-top:50rpx;"><text class="num data-v-185ecc00">{{i18n.Ordertime+":"}}</text><text class="num data-v-185ecc00">{{orderinfo.created_at}}</text></view></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss

@@ -1 +1 @@
-.orderinfo.data-v-66b183e6{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-66b183e6{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-66b183e6{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-66b183e6{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-66b183e6{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}
+.orderinfo.data-v-185ecc00{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-185ecc00{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-185ecc00{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-185ecc00{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-185ecc00{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-185ecc00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"257a":function(t,e,n){},4539:function(t,e,n){"use strict";n.r(e);var i=n("dae5"),c=n("4b1a");for(var a in c)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(a);n("9cf8");var o,u=n("f0c5"),r=Object(u["a"])(c["default"],i["b"],i["c"],!1,null,"0f1680d0",null,!1,i["a"],o);e["default"]=r.exports},"4b1a":function(t,e,n){"use strict";n.r(e);var i=n("c4b0"),c=n.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);e["default"]=c.a},"9cf8":function(t,e,n){"use strict";var i=n("257a"),c=n.n(i);c.a},c4b0:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:"",code:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{toexpress:function(){var e=this;t.navigateTo({url:"/pageB/expresstype",events:{todcp:function(t){e.logistics_company_name=t.concant,e.code=t.code}}})},offline:function(){var e=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.code,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(n){e.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};e.default=n}).call(this,n("543d")["default"])},dae5:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return i}));var c=function(){var t=this,e=t.$createElement;t._self._c},a=[]},f791:function(t,e,n){"use strict";(function(t,e){var i=n("4ea4");n("f93b");i(n("66fd"));var c=i(n("4539"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{4539:function(t,e,n){"use strict";n.r(e);var c=n("c002"),i=n("4b1a");for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);n("cc06");var o,u=n("f0c5"),s=Object(u["a"])(i["default"],c["b"],c["c"],!1,null,"42e1a5af",null,!1,c["a"],o);e["default"]=s.exports},"4b1a":function(t,e,n){"use strict";n.r(e);var c=n("c4b0"),i=n.n(c);for(var a in c)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(a);e["default"]=i.a},"846a":function(t,e,n){},c002:function(t,e,n){"use strict";var c;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return c}));var i=function(){var t=this,e=t.$createElement;t._self._c},a=[]},c4b0:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:"",code:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{toexpress:function(){var e=this;t.navigateTo({url:"/pageB/expresstype",events:{todcp:function(t){e.logistics_company_name=t.concant,e.code=t.code}}})},offline:function(){var e=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.code,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(n){e.$u.toast(e.i18n.successfullyAdded),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};e.default=n}).call(this,n("543d")["default"])},cc06:function(t,e,n){"use strict";var c=n("846a"),i=n.n(c);i.a},f791:function(t,e,n){"use strict";(function(t,e){var c=n("4ea4");n("f93b");c(n("66fd"));var i=c(n("4539"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(i.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/parcel.wxml

@@ -1 +1 @@
-<view class="back data-v-0f1680d0"><view class="box data-v-0f1680d0" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-0f1680d0"><text class="name data-v-0f1680d0">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-0f1680d0"/></view></view><view class="box data-v-0f1680d0"><view class="boxitem u-flex u-row-between data-v-0f1680d0"><text class="name data-v-0f1680d0">{{i18n.Expresscompany}}</text><view data-event-opts="{{[['tap',[['toexpress',['$event']]]]]}}" class="u-flex data-v-0f1680d0" bindtap="__e"><view class="selection data-v-0f1680d0">{{logistics_company_name||i18n.selection}}</view><image style="width:30rpx;height:30rpx;" src="../static/express/next1.png" mode class="data-v-0f1680d0"></image></view></view></view><view class="box data-v-0f1680d0" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex u-row-end data-v-0f1680d0"><text class="name data-v-0f1680d0">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-0f1680d0"/><text class="data-v-0f1680d0">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-0f1680d0" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>
+<view class="back data-v-42e1a5af"><view class="box data-v-42e1a5af" style="border-radius:16rpx 16rpx 0 0;"><view class="boxitem u-flex data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.TrackingNumber}}</text><input style="flex:1;" type="text" placeholder="{{i18n.trackingNumber}}" data-event-opts="{{[['input',[['__set_model',['','logistics_no','$event',[]]]]]]}}" value="{{logistics_no}}" bindinput="__e" class="data-v-42e1a5af"/></view></view><view class="box data-v-42e1a5af"><view class="boxitem u-flex u-row-between data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.Expresscompany}}</text><view data-event-opts="{{[['tap',[['toexpress',['$event']]]]]}}" class="u-flex data-v-42e1a5af" bindtap="__e"><view class="selection data-v-42e1a5af">{{logistics_company_name||i18n.selection}}</view><image style="width:30rpx;height:30rpx;" src="../static/express/next1.png" mode class="data-v-42e1a5af"></image></view></view></view><view class="box data-v-42e1a5af" style="border-radius:0 0 16rpx 16rpx;"><view class="boxitem u-flex u-row-end data-v-42e1a5af"><text class="name data-v-42e1a5af">{{i18n.Parcelweight}}</text><input style="flex:1;" type="text" placeholder="{{i18n.parcelWeight}}" data-event-opts="{{[['input',[['__set_model',['','estimated_weight','$event',[]]]]]]}}" value="{{estimated_weight}}" bindinput="__e" class="data-v-42e1a5af"/><text class="data-v-42e1a5af">kg</text></view></view><view data-event-opts="{{[['tap',[['offline',['$event']]]]]}}" class="btn data-v-42e1a5af" bindtap="__e">{{''+i18n.Addlist+''}}</view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/parcel.wxss

@@ -1 +1 @@
-.selection.data-v-0f1680d0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#666;line-height:40rpx;text-align:left;font-style:normal}.btn.data-v-0f1680d0{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal;margin-top:94rpx}.back.data-v-0f1680d0{box-sizing:border-box;padding:20rpx 24rpx}.box.data-v-0f1680d0{padding:0 28rpx;box-sizing:border-box;width:702rpx;background:#fff;box-sizing:border-box}.box .boxitem.data-v-0f1680d0{height:100rpx;width:646rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.box .name.data-v-0f1680d0{width:150rpx;display:block;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#222;line-height:42rpx;text-align:left;font-style:normal;margin-right:44rpx}
+.selection.data-v-42e1a5af{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#666;line-height:40rpx;text-align:left;font-style:normal}.btn.data-v-42e1a5af{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal;margin-top:94rpx}.back.data-v-42e1a5af{box-sizing:border-box;padding:20rpx 24rpx}.box.data-v-42e1a5af{padding:0 28rpx;box-sizing:border-box;width:702rpx;background:#fff;box-sizing:border-box}.box .boxitem.data-v-42e1a5af{height:100rpx;width:646rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.box .name.data-v-42e1a5af{width:150rpx;display:block;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:30rpx;color:#222;line-height:42rpx;text-align:left;font-style:normal;margin-right:44rpx}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/search.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/search.wxss

@@ -1 +1 @@
-.searchitem.data-v-ebbe1b16{height:98rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);line-height:98rpx}.title.data-v-ebbe1b16{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.tabs.data-v-ebbe1b16{height:58rpx;background:#f5f5f5;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;text-align:center;font-style:normal;display:inline;padding:12rpx 24rpx;box-sizing:border-box;margin-top:24rpx}.back.data-v-ebbe1b16{padding:28rpx 20rpx!important;background-color:#fff;min-height:calc(100vh - 44rpx)}
+.searchitem.data-v-1ef384d5{height:98rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1);line-height:98rpx}.title.data-v-1ef384d5{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.tabs.data-v-1ef384d5{height:58rpx;background:#f5f5f5;border-radius:36rpx;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#333;text-align:center;font-style:normal;display:inline;padding:12rpx 24rpx;box-sizing:border-box;margin-top:24rpx}.back.data-v-1ef384d5{padding:28rpx 20rpx!important;background-color:#fff;min-height:calc(100vh - 44rpx)}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.js


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

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

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

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

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"4ce8":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return r}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.__map(t.itemInfo.order_goods,(function(n,e){var r=t.__get_orig(n),u=n.amount.split("."),c=n.amount.split(".");return{$orig:r,g0:u,g1:c}})));t.$mp.data=Object.assign({},{$root:{l0:e}})},c=[]},"67f8":function(t,n,e){"use strict";e.r(n);var r=e("d77c"),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(c);n["default"]=u.a},c0c8:function(t,n,e){},d77c:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=r},e1ce:function(t,n,e){"use strict";e.r(n);var r=e("4ce8"),u=e("67f8");for(var c in u)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(c);e("fc42");var o,f=e("f0c5"),a=Object(f["a"])(u["default"],r["b"],r["c"],!1,null,"97f7bda6",null,!1,r["a"],o);n["default"]=a.exports},fc42:function(t,n,e){"use strict";var r=e("c0c8"),u=e.n(r);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{"0cb8":function(t,e,n){"use strict";var r=n("e7c9"),u=n.n(r);u.a},"1e1d":function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return r}));var u=function(){var t=this,e=t.$createElement,n=(t._self._c,t.__map(t.itemInfo.order_goods,(function(e,n){var r=t.__get_orig(e),u=e.amount.split("."),o=e.amount.split(".");return{$orig:r,g0:u,g1:o}})));t.$mp.data=Object.assign({},{$root:{l0:n}})},o=[]},"67f8":function(t,e,n){"use strict";n.r(e);var r=n("d77c"),u=n.n(r);for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);e["default"]=u.a},d77c:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};e.default=r},e1ce:function(t,e,n){"use strict";n.r(e);var r=n("1e1d"),u=n("67f8");for(var o in u)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(o);n("0cb8");var a,c=n("f0c5"),f=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"4e81abe7",null,!1,r["a"],a);e["default"]=f.exports},e7c9:function(t,e,n){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxss

@@ -1 +1 @@
-.page.data-v-16e86283{padding:20rpx 24rpx;position:relative}.page .top.data-v-16e86283{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-16e86283{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-16e86283{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-16e86283{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-16e86283{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-16e86283{font-size:26rpx;color:#666}.page .address .address-detail.data-v-16e86283{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-16e86283{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-16e86283{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-16e86283{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}
+.page.data-v-44d937b0{padding:20rpx 24rpx;position:relative}.page .top.data-v-44d937b0{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-44d937b0{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-44d937b0{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-44d937b0{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-44d937b0{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-44d937b0{font-size:26rpx;color:#666}.page .address .address-detail.data-v-44d937b0{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-44d937b0{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-44d937b0{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-44d937b0{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}

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

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

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff