zhaogongxue пре 7 месеци
родитељ
комит
0f6200b1fb
100 измењених фајлова са 191 додато и 63 уклоњено
  1. 17 5
      commont/messages.js
  2. 60 27
      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/pageC/myPackage/component/packageCard.js
  38. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxml
  39. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxss
  40. 0 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.js
  41. 1 1
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxml
  42. 1 1
      unpackage/dist/build/mp-weixin/pageC/myPackage/myPackage.wxss
  43. 1 1
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js
  44. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxml
  45. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxss
  46. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js
  47. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml
  48. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss
  49. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js
  50. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxml
  51. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.wxss
  52. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js
  53. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml
  54. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss
  55. 0 0
      unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.js
  56. 0 0
      unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml
  57. 1 1
      unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxss
  58. 1 1
      unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.js
  59. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.wxml
  60. 1 1
      unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.wxss
  61. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.js
  62. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxml
  63. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxss
  64. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.js
  65. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.wxml
  66. 1 1
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.wxss
  67. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.js
  68. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.wxml
  69. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.wxss
  70. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.js
  71. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.wxml
  72. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.wxss
  73. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  74. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  75. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  76. 1 1
      unpackage/dist/build/mp-weixin/project.config.json
  77. BIN
      unpackage/dist/build/mp-weixin/static/express/label1.png
  78. BIN
      unpackage/dist/build/mp-weixin/static/express/label2.png
  79. BIN
      unpackage/dist/build/mp-weixin/static/express/label3.png
  80. BIN
      unpackage/dist/build/mp-weixin/static/images/index/butie1.png
  81. BIN
      unpackage/dist/build/mp-weixin/static/images/index/butie2.png
  82. BIN
      unpackage/dist/build/mp-weixin/static/images/index/butie3.png
  83. BIN
      unpackage/dist/build/mp-weixin/static/images/index/pinbao1.png
  84. BIN
      unpackage/dist/build/mp-weixin/static/images/index/pinbao2.png
  85. BIN
      unpackage/dist/build/mp-weixin/static/images/index/pinbao3.png
  86. BIN
      unpackage/dist/build/mp-weixin/static/images/index/postage1.png
  87. BIN
      unpackage/dist/build/mp-weixin/static/images/index/postage2.png
  88. BIN
      unpackage/dist/build/mp-weixin/static/images/index/postage3.png
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  93. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  94. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  95. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/balance.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  98. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  99. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map

+ 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'
 		},
 	},
 };

+ 60 - 27
pageA/order.vue

@@ -28,7 +28,10 @@
               flex: 1;
             ">
 						<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">
@@ -59,7 +62,10 @@
               flex: 1;
             ">
 						<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>
@@ -76,7 +82,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>
@@ -94,7 +100,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>
@@ -104,7 +110,17 @@
 		<!-- 推荐 -->
 		<view class="recommend">
 			<view class="top">
-				<image src="static/images/recommend.png" style="width: 124rpx; height: 30rpx" mode=""></image>
+				<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">
@@ -362,6 +378,7 @@
 				stringcheck: "",
 				cartid: "",
 				weight_total: "",
+				valuenum: false,
 			};
 		},
 		computed: {
@@ -396,6 +413,16 @@
 			// 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,
@@ -466,6 +493,7 @@
 			},
 			//货柜列表
 			container() {
+				
 				this.containlist = [];
 				uni.$u.http
 					.get("/api/container-base", {
@@ -625,6 +653,7 @@
 			},
 			//确定
 			confirm() {
+				this.valuenum = false
 				this.show1 = false;
 				this.containname1 = this.containname;
 				this.recommendweight();
@@ -637,28 +666,32 @@
 			},
 			//提交订单
 			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


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.wxss


Разлика између датотеке није приказан због своје велике величине
+ 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',
     {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js


Разлика између датотеке није приказан због своје велике величине
+ 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',
     {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml


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

@@ -1 +1 @@
-.page.data-v-5054fdf5{background:#f4f4f4;padding:20rpx 24rpx;box-sizing:border-box;padding-bottom:200rpx}.page .address.data-v-5054fdf5{width:702rpx;background:#fff;border-radius:16rpx;padding:32rpx 24rpx;box-sizing:border-box}.page .address .add.data-v-5054fdf5{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-5054fdf5{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-5054fdf5{width:702rpx;background:#fff;border-radius:16rpx;padding:28rpx 22rpx;box-sizing:border-box;margin-top:20rpx}.page .logistics .change.data-v-5054fdf5{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-5054fdf5{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-5054fdf5{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-5054fdf5{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-5054fdf5{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-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}

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/orderDetail/component/commodityDetail"],{"0d03":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:Number,default:0},commodityInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{avatar:""}},watch:{commodityInformation:function(t){console.log(t),t.member&&(this.avatar=t.member.avatar)}},methods:{application:function(){t.navigateTo({url:"/pageC/applicationRefund/applicationRefund"})}}};n.default=o}).call(this,o("543d")["default"])},1663:function(t,n,o){"use strict";var a;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return e})),o.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.commodityInformation.goods,(function(n,o){var a=t.__get_orig(n),i=n.amount.split("."),e=n.amount.split(".");return{$orig:a,g0:i,g1:e}}))),a=t.commodityInformation.goods?t.commodityInformation.goods.length:null,i=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null,e=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:o,g2:a,g3:i,g4:e}})},e=[]},2588:function(t,n,o){"use strict";var a=o("b2bb"),i=o.n(a);i.a},"931d":function(t,n,o){"use strict";o.r(n);var a=o("1663"),i=o("d2bc");for(var e in i)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(e);o("2588");var r,u=o("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"54c806dd",null,!1,a["a"],r);n["default"]=c.exports},b2bb:function(t,n,o){},d2bc:function(t,n,o){"use strict";o.r(n);var a=o("0d03"),i=o.n(a);for(var e in a)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return a[t]}))}(e);n["default"]=i.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/orderDetail/component/commodityDetail"],{"0d03":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:Number,default:0},commodityInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{avatar:""}},watch:{commodityInformation:function(t){console.log(t),t.member&&(this.avatar=t.member.avatar)}},methods:{application:function(){t.navigateTo({url:"/pageC/applicationRefund/applicationRefund"})}}};n.default=o}).call(this,o("543d")["default"])},5450:function(t,n,o){"use strict";var a=o("7e21"),i=o.n(a);i.a},7736:function(t,n,o){"use strict";var a;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return e})),o.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.commodityInformation.goods,(function(n,o){var a=t.__get_orig(n),i=n.sku_item.price.split("."),e=n.sku_item.price.split(".");return{$orig:a,g0:i,g1:e}}))),a=t.commodityInformation.goods?t.commodityInformation.goods.length:null,i=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null,e=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:o,g2:a,g3:i,g4:e}})},e=[]},"7e21":function(t,n,o){},"931d":function(t,n,o){"use strict";o.r(n);var a=o("7736"),i=o("d2bc");for(var e in i)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(e);o("5450");var r,u=o("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"ff5bfc1a",null,!1,a["a"],r);n["default"]=c.exports},d2bc:function(t,n,o){"use strict";o.r(n);var a=o("0d03"),i=o.n(a);for(var e in a)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return a[t]}))}(e);n["default"]=i.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/orderDetail/component/commodityDetail-create-component',
     {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.wxss

@@ -1 +1 @@
-.detail.data-v-54c806dd{padding:28rpx 20rpx;background-color:#fff;border-radius:16rpx;margin-top:28rpx}.detail .title.data-v-54c806dd{display:flex;justify-content:space-between}.detail .title .title-left.data-v-54c806dd{display:flex;font-size:32rpx;align-items:center}.detail .title .title-left .header-img.data-v-54c806dd{width:36rpx;height:36rpx;border-radius:50%;margin-right:20rpx}.detail .title .title-left .right-325.data-v-54c806dd{width:32rpx;height:32rpx}.detail .title .order-status.data-v-54c806dd{color:#f83224;font-size:26rpx}.detail .commodity-information.data-v-54c806dd{margin-top:28rpx}.detail .commodity-information .commodity-1.data-v-54c806dd{display:flex}.detail .commodity-information .commodity-1 .commodity-img.data-v-54c806dd{width:180rpx;height:180rpx;margin-right:20rpx;border-radius:10rpx}.detail .commodity-information .commodity-1 .commodity-2.data-v-54c806dd{display:flex;justify-content:space-between}.detail .commodity-information .commodity-1 .commodity-2 .commodity-title.data-v-54c806dd{width:328rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-right:38rpx}.detail .commodity-information .commodity-1 .commodity-3.data-v-54c806dd{display:flex;justify-content:space-between;margin-top:20rpx;color:#777}.detail .commodity-information .commodity-1 .commodity-3 .specifications.data-v-54c806dd{font-size:28rpx;color:#777}.detail .last.data-v-54c806dd{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);padding-bottom:20rpx}.detail .btn-list.data-v-54c806dd{display:flex;justify-content:flex-end;align-items:center}.detail .information.data-v-54c806dd{display:flex;justify-content:space-between;font-size:28rpx;align-items:flex-end;margin-top:34rpx}.detail .information ._label.data-v-54c806dd{font-size:28rpx;color:#333}.detail .information ._title-right.data-v-54c806dd{font-size:28rpx;color:#333;opacity:.6}
+.detail.data-v-ff5bfc1a{padding:28rpx 20rpx;background-color:#fff;border-radius:16rpx;margin-top:28rpx}.detail .title.data-v-ff5bfc1a{display:flex;justify-content:space-between}.detail .title .title-left.data-v-ff5bfc1a{display:flex;font-size:32rpx;align-items:center}.detail .title .title-left .header-img.data-v-ff5bfc1a{width:36rpx;height:36rpx;border-radius:50%;margin-right:20rpx}.detail .title .title-left .right-325.data-v-ff5bfc1a{width:32rpx;height:32rpx}.detail .title .order-status.data-v-ff5bfc1a{color:#f83224;font-size:26rpx}.detail .commodity-information.data-v-ff5bfc1a{margin-top:28rpx}.detail .commodity-information .commodity-1.data-v-ff5bfc1a{display:flex;margin-bottom:10rpx}.detail .commodity-information .commodity-1 .commodity-img.data-v-ff5bfc1a{width:180rpx;height:180rpx;margin-right:20rpx;border-radius:10rpx}.detail .commodity-information .commodity-1 .commodity-2.data-v-ff5bfc1a{display:flex;justify-content:space-between}.detail .commodity-information .commodity-1 .commodity-2 .commodity-title.data-v-ff5bfc1a{width:328rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-right:38rpx}.detail .commodity-information .commodity-1 .commodity-3.data-v-ff5bfc1a{display:flex;justify-content:space-between;margin-top:20rpx;color:#777}.detail .commodity-information .commodity-1 .commodity-3 .specifications.data-v-ff5bfc1a{font-size:28rpx;color:#777}.detail .last.data-v-ff5bfc1a{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);padding-bottom:20rpx}.detail .btn-list.data-v-ff5bfc1a{display:flex;justify-content:flex-end;align-items:center}.detail .information.data-v-ff5bfc1a{display:flex;justify-content:space-between;font-size:28rpx;align-items:flex-end;margin-top:34rpx}.detail .information ._label.data-v-ff5bfc1a{font-size:28rpx;color:#333}.detail .information ._title-right.data-v-ff5bfc1a{font-size:28rpx;color:#333;opacity:.6}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.wxml


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

@@ -1 +1 @@
-.page .tab-1.data-v-43a39d19{padding:0 24rpx;background-color:#fff}.page .tab-1.data-v-43a39d19  .u-input{background-color:#f4f4f4}.page .tab-1 .top-tab.data-v-43a39d19{margin-top:20rpx;display:flex;justify-content:space-between;overflow-y:auto;padding-bottom:10rpx}.page .tab-1 .top-tab .tab.data-v-43a39d19{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.page .tab-1 .top-tab .commodity.data-v-43a39d19{position:relative;font-weight:600;font-size:32rpx}.page .tab-1 .top-tab .commodity.data-v-43a39d19::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.page .center.data-v-43a39d19{padding:20rpx 24rpx}
+.page .tab-1.data-v-5116d081{padding:0 24rpx;background-color:#fff}.page .tab-1.data-v-5116d081  .u-input{background-color:#f4f4f4}.page .tab-1 .top-tab.data-v-5116d081{margin-top:20rpx;display:flex;justify-content:space-between;overflow-y:auto;padding-bottom:10rpx}.page .tab-1 .top-tab .tab.data-v-5116d081{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.page .tab-1 .top-tab .commodity.data-v-5116d081{position:relative;font-weight:600;font-size:32rpx}.page .tab-1 .top-tab .commodity.data-v-5116d081::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}.page .center.data-v-5116d081{padding:20rpx 24rpx}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/cart/cart.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/cart/cart.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/cart/cart.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/express/express.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/express/express.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/express/express.wxss


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


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

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

BIN
unpackage/dist/build/mp-weixin/static/express/label1.png


BIN
unpackage/dist/build/mp-weixin/static/express/label2.png


BIN
unpackage/dist/build/mp-weixin/static/express/label3.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/butie1.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/butie2.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/butie3.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/pinbao1.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/pinbao2.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/pinbao3.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/postage1.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/postage2.png


BIN
unpackage/dist/build/mp-weixin/static/images/index/postage3.png


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/balance.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map


Неке датотеке нису приказане због велике количине промена