浏览代码

解决冲突

zhaogongxue 7 月之前
父节点
当前提交
7f68731923
共有 100 个文件被更改,包括 128 次插入121 次删除
  1. 57 13
      commont/messages.js
  2. 2 2
      components/kj-flow/kj-flow.vue
  3. 4 4
      pageA/changelange.vue
  4. 1 1
      pageA/comment.vue
  5. 3 3
      pageA/counter.vue
  6. 9 8
      pageA/order.vue
  7. 3 12
      pageA/payorder.vue
  8. 22 15
      pageA/productdetails.vue
  9. 3 1
      unpackage/dist/build/mp-weixin/app.json
  10. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  11. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js
  12. 0 0
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxml
  13. 1 1
      unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss
  14. 0 0
      unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js
  15. 0 0
      unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxml
  16. 1 1
      unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/changelange.wxml
  19. 1 1
      unpackage/dist/build/mp-weixin/pageA/changelange.wxss
  20. 0 0
      unpackage/dist/build/mp-weixin/pageA/comment.js
  21. 1 1
      unpackage/dist/build/mp-weixin/pageA/comment.wxml
  22. 1 1
      unpackage/dist/build/mp-weixin/pageA/comment.wxss
  23. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.wxml
  25. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.wxss
  26. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  27. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  28. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  29. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  30. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  31. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  32. 0 1
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  33. 0 1
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  34. 0 1
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxss
  35. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.js
  36. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxml
  37. 1 1
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxss
  38. 0 1
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js
  39. 0 1
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml
  40. 0 1
      unpackage/dist/build/mp-weixin/pageB/delivery.js
  41. 0 1
      unpackage/dist/build/mp-weixin/pageB/delivery.wxml
  42. 0 1
      unpackage/dist/build/mp-weixin/pageB/goods.js
  43. 0 1
      unpackage/dist/build/mp-weixin/pageB/goods.wxml
  44. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js
  45. 0 0
      unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.wxml
  46. 1 1
      unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.wxss
  47. 1 1
      unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.js
  48. 3 1
      unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.json
  49. 1 1
      unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.wxml
  50. 0 1
      unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js
  51. 1 1
      unpackage/dist/build/mp-weixin/pageC/privacyPolicy/privacyPolicy.js
  52. 1 1
      unpackage/dist/build/mp-weixin/pageC/privacyPolicy/privacyPolicy.wxml
  53. 0 1
      unpackage/dist/build/mp-weixin/pageD/orderInformation/orderInformation.js
  54. 0 0
      unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.js
  55. 0 0
      unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.wxml
  56. 1 1
      unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.wxss
  57. 0 0
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.js
  58. 0 0
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxml
  59. 1 1
      unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxss
  60. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.js
  61. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.wxml
  62. 0 0
      unpackage/dist/build/mp-weixin/pages/cart/cart.wxss
  63. 0 1
      unpackage/dist/build/mp-weixin/pages/express/express.js
  64. 0 1
      unpackage/dist/build/mp-weixin/pages/express/express.wxml
  65. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.wxss
  66. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  67. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  68. 0 0
      unpackage/dist/build/mp-weixin/uview-ui/components/u-parse/u-parse.js
  69. 2 2
      unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json
  70. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  73. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  74. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  75. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  76. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/balance.js.map
  78. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map
  79. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  80. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  81. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map
  82. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map
  83. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/counter.js.map
  84. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map
  85. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/logisticsinfo.js.map
  86. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  87. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map
  88. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  89. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map
  90. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  91. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map
  92. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoptype.js.map
  93. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map
  94. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/ParcelExpress.js.map
  95. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/Senderinfor.js.map
  96. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/account.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/citychange.js.map
  98. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/delivery.js.map
  99. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map
  100. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map

+ 57 - 13
commont/messages.js

@@ -294,19 +294,30 @@ export default {
 			Please: '请输入物品名称',
 			Filling: '填写准确的寄送物品可帮助您推荐更合适的产品',
 			Note: '注:实际重量体积以收派员确定为准,物品在包装后重量可能会增加,重量小体积大时会按体积重量收费',
-			
-			window:'请点击右上角浮窗进行复制',
-			Recent :'最近使用',
-			nodata:'暂无数据',
-			Pleasecountry:'请先选择国家',
-			
+
+			window: '请点击右上角浮窗进行复制',
+			Recent: '最近使用',
+			nodata: '暂无数据',
+			Pleasecountry: '请先选择国家',
+			container: '请选择货柜',
+			skip: '跳过',
+			Login: '登录成功',
+			selectcity: '请先选择城市',
+			shippingaddress: '请添加您的收货地址',
+			shippingmethod: '请选择货运方式',
+			Followed: '已关注',
+			Addtocart: '加入购物车',
+			grouping: '立即拼团',
+			Selected: '已选',
+			Buynow: '立即购买',
+
 		},
 	},
 	//英语
 	"en-US": {
 		index: {
 			homepage: "Homepage",
-			switchLanguage: "Switch Language",  
+			switchLanguage: "Switch Language",
 			address: "Address Management",
 			addAndEdit: "add/modify Address",
 			account: "Account and Security",
@@ -589,7 +600,24 @@ export default {
 
 			Please: 'Please enter the item name',
 			Filling: 'Filling in the accurate items for shipment can help us recommend more suitable products for you',
-			Note: 'Note: The actual weight and volume are subject to the determination by the courier. The weight may increase after packaging, and if the item has a small weight but a large volume, it will be charged based on the volumetric weight'
+			Note: 'Note: The actual weight and volume are subject to the determination by the courier. The weight may increase after packaging, and if the item has a small weight but a large volume, it will be charged based on the volumetric weight',
+
+			window: 'Please click the floating window in the upper right corner to copy.',
+			Recent: 'Recently Used',
+			nodata: 'No Data Available',
+			Pleasecountry: 'Please Select a Country First',
+			container: 'Please Select a Container',
+			skip: 'Skip',
+			Login: 'Login Successful',
+			selectcity: 'Please Select a City First',
+			shippingaddress: 'Please Add Your Shipping Address',
+			shippingmethod: 'Please Select a Shipping Method',
+			Followed: 'Followed',
+			Addtocart: 'Add to Cart',
+			grouping: 'Join Group Now',
+			Selected: 'Selected',
+			Buynow: 'Buy Now',
+
 		},
 	},
 	// 西班牙
@@ -873,12 +901,12 @@ export default {
 			accurately: 'Estimación de los costos más precisa al complementar con el volumen',
 			volume: 'Volume totale',
 			since: 'Desde',
-			
-			
+
+
 			Please: 'Por favor, introduzca el nombre del artículo',
 			Filling: 'Rellene el artículo de envío con precisión para que podamos recomendarle productos más adecuados',
 			Note: 'Nota: El peso y el volumen reales se determinan por el mensajero. El peso puede aumentar después del empaque, y si el artículo tiene un peso pequeño pero un volumen grande, se cobrará según el peso volumétrico'
-			
+
 		},
 	},
 	//意大利
@@ -1162,10 +1190,26 @@ export default {
 			accurately: 'Stimare il costo con maggiore precisione integrando il volume',
 			volume: 'Volume totale',
 			since: 'Da',
-			
+
 			Please: "Per favore, inserisci il nome dell'oggetto",
 			Filling: "Compilare il nome dell'oggetto da spedire con precisione può aiutarci a consigliare prodotti più adatt",
-			Note: "Nota: Il peso e il volume effettivi sono determinati dal corriere. Il peso potrebbe aumentare dopo l'imballaggio, e se l'oggetto ha un peso basso ma un volume elevato, verrà addebitato in base al peso volumetrico"
+			Note: "Nota: Il peso e il volume effettivi sono determinati dal corriere. Il peso potrebbe aumentare dopo l'imballaggio, e se l'oggetto ha un peso basso ma un volume elevato, verrà addebitato in base al peso volumetrico",
+
+			window: 'Si prega di cliccare sulla finestra fluttuante nell angolo in alto a destra per copiare.',
+			Recent: 'Usato di recente',
+			nodata: 'Nessun dato disponibile',
+			Pleasecountry: 'Si prega di selezionare un paese prima',
+			container: 'Si prega di scegliere un contenitore',
+			skip: 'Salta',
+			Login: 'Accesso riuscito',
+			selectcity: 'Si prega di selezionare una città prima',
+			shippingaddress: 'Si prega di aggiungere il proprio indirizzo di spedizione',
+			shippingmethod: 'Si prega di scegliere un metodo di spedizione',
+			Followed: 'Seguito',
+			Addtocart: 'Aggiungi al carrello',
+			grouping: 'Unisciti al gruppo immediatamente',
+			Selected: 'Selezionato',
+			Buynow: 'Acquista ora',
 		},
 	},
 };

+ 2 - 2
components/kj-flow/kj-flow.vue

@@ -106,7 +106,7 @@ color: #666666;">{{item.name_ita}}</view>
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
-			this.transport
+			this.transport()
 		},
 		onLoad() {
 			if (uni.getStorageSync('language') != '') {
@@ -306,7 +306,7 @@ color: #666666;">{{item.name_ita}}</view>
 		font-size: 20rpx;
 		color: #333333;
 		line-height: 28rpx;
-		text-align: right;
+		text-align: center;
 		font-style: normal;
 	}
 </style>

+ 4 - 4
pageA/changelange.vue

@@ -23,8 +23,8 @@
 		</view>
 		<view class="bottom u-flex u-row-between"
 			style="position: fixed;bottom:80rpx;width: 750rpx;padding: 20rpx 24rpx 24rpx 0;box-sizing: border-box;">
-			<view class="btnleft" @click="toindex">跳过</view>
-			<view class="btnright" style="margin-right: 24rpx;" @click="enter">确定</view>
+			<view class="btnleft" @click="toindex">{{i18n.skip}}</view>
+			<view class="btnright" style="margin-right: 24rpx;" @click="enter">{{i18n.enter}}</view>
 		</view>
 	</view>
 </template>
@@ -60,7 +60,7 @@
 			},
 			enter() {
 				uni.setStorageSync("language", this.languageSelect)
-				this.$u.toast('登录成功')
+				this.$u.toast(this.i18n.Login)
 				setTimeout(() => {
 					uni.switchTab({
 						url: '/pages/index/index'
@@ -68,7 +68,7 @@
 				}, 800)
 			},
 			toindex() {
-				this.$u.toast('登录成功')
+				this.$u.toast(this.i18n.Login)
 				setTimeout(() => {
 					uni.switchTab({
 						url: '/pages/index/index'

+ 1 - 1
pageA/comment.vue

@@ -29,7 +29,7 @@
 			</view>
 		</view>
 		<view class="" style="height: 400rpx;text-align: center;line-height: 400rpx;">
-			暂无数据
+			{{i18n.nodata}}
 		</view>
 	</view>
 </template>

+ 3 - 3
pageA/counter.vue

@@ -173,13 +173,13 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 						this.$refs.child.transport();
 					}, 800)
 				} else {
-					this.$u.toast('请先选择城市')
+					this.$u.toast(this.i18n.selectcity)
 				}
 			},
 			//物流计算器
 			calculate() {
 				if (this.container_id == '') {
-					this.$u.toast('请选择货柜')
+					this.$u.toast(this.i18n.container)
 					return
 				}
 				uni.$u.http.get('/api/express-order/calculate', {
@@ -243,7 +243,7 @@ color: rgba(34, 34, 34, 0.5);">{{i18n.accurately}}</text>
 			//获取价格
 			gain() {
 				if (this.container_id == '') {
-					this.$u.toast('请选择货柜')
+					this.$u.toast(this.i18n.container)
 				} else {
 					this.gat = 1
 					this.gatShow = true

+ 9 - 8
pageA/order.vue

@@ -4,7 +4,7 @@
 		<view class="address" @click="toadd">
 			<view class="u-flex u-row-between">
 				<view class="add" v-if="addinfo">{{addinfo.full_address}}</view>
-				<view class="" v-else>请添加您的收货地址</view>
+				<view class="" v-else>{{i18n.shippingaddress}}</view>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
 			<view class="info" v-if="addinfo">
@@ -134,11 +134,11 @@
 			</view>
 			<view class="u-flex u-row-between" style='margin-bottom:40rpx;margin-top: 20rpx;'>
 				<view class="name">{{i18n.Costperkilogram}}</view>
-				<view class="money">{{containname1?unit_price:'需先选择货运方式'}}</view>
+				<view class="money">{{containname1?unit_price:i18n.shippingmethod}}</view>
 			</view>
 			<view class="u-flex u-row-between">
 				<view class="name">{{i18n.freight}}</view>
-				<view class="money">{{containname1?sum:'需先选择货运方式'}}</view>
+				<view class="money">{{containname1?sum:i18n.shippingmethod}}</view>
 			</view>
 			<view class="zong u-flex u-row-right">
 				<view class="">
@@ -182,7 +182,7 @@
 				</view>
 				<view class="u-flex " style="margin-top: 60rpx;flex-wrap: wrap;column-gap: 16rpx;">
 					<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in containerList"
-						 @click="change(item,idx)"
+						@click="change(item,idx)"
 						style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-bottom: 28rpx;position: relative;">
 						<image v-if="index==idx" src="static/images/change.png"
 							style="width: 36rpx;height: 32rpx;position: absolute;top: 0;right: 0;" mode=""></image>
@@ -388,7 +388,8 @@
 						is_page: 0,
 						province_id: this.province_id,
 						transport_type_id: this.transport_type_id,
-						weight: Number(this.sku_info.weight) * this.value,
+						weight: this.typea == 'shop' ?
+							this.goodsWeight : Number(this.sku_info.weight) * this.value,
 						type: this.goodinfo.cate == 0 ? 'normal' : 'special',
 						length: Number(this.goodinfo.length) * this.value, //		是	String	长
 						width: this.goodinfo.width, //		是	String	宽
@@ -396,9 +397,9 @@
 					}
 				}).then((res) => {
 					res.forEach((item) => {
-						// if (item.sum != 0) {
-						this.containlist.push(item)
-						// }
+						if (item.sum != 0) {
+							this.containlist.push(item)
+						}
 						console.log(this.containlist);
 					})
 					// this.sum = this.containlist[0].sum

+ 3 - 12
pageA/payorder.vue

@@ -205,15 +205,6 @@ export default {
       state: "人民币",
       state_id: 0,
       array: [
-        {
-          name: "人民币",
-        },
-        {
-          name: "欧元",
-        },
-        {
-          name: "美元",
-        },
       ],
       sum: "",
       pay_type: "balance",
@@ -355,7 +346,7 @@ export default {
                 signType: res.signType,
                 paySign: res.paySign,
                 success: function (res) {
-                  this.$u.toast("支付成功");
+                  this.$u.toast(this.i18n.Paymentsuccess);
                   console.log("success:" + JSON.stringify(res));
                   setTimeout(() => {
                     uni.navigateTo({
@@ -377,7 +368,7 @@ export default {
               });
             }
             uni.showToast({
-              title: "支付成功",
+              title: this.i18n.Paymentsuccess,
               icon: "none",
             });
             uni.navigateBack({
@@ -434,7 +425,7 @@ export default {
 							}
 
             uni.showToast({
-              title: "支付成功",
+              title: this.i18n.Paymentsuccess,
               icon: "none",
             });
             uni.navigateBack({

+ 22 - 15
pageA/productdetails.vue

@@ -269,15 +269,16 @@
 							<view v-if="goodinfo.is_interest == 1" class="ke">{{
                 i18n.follow
               }}</view>
-							<view v-if="goodinfo.is_interest == 0" class="ke" style="color: rgba(248, 50, 36, 1)">已关注
+							<view v-if="goodinfo.is_interest == 0" class="ke" style="color: rgba(248, 50, 36, 1)">
+								{{i18n.Followed}}
 							</view>
 						</view>
 					</view>
 					<view v-if="sku_info.stock_total == 0" class="tongzhi" @click="inform">
 						{{ i18n.notification }}
 					</view>
-					<view v-if="sku_info.stock_total != 0" class="join" @click="join(0)">加入购物车</view>
-					<view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)">立即拼团</view>
+					<view v-if="sku_info.stock_total != 0" class="join" @click="join(0)">{{i18n.Addtocart}}</view>
+					<view v-if="sku_info.stock_total != 0" class="pin" @click="join(1)">{{i18n.grouping}}</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -310,7 +311,7 @@
 							<!-- <text class="read" v-if="goodinfo.is_discount==1">{{(goodinfo.price * value).slice(-3)}}</text> -->
 							<!-- <text class="read" style="font-size: 40rpx;" >{{(Number(goodinfo.price) * Number(value)).toString()}}</text> -->
 						</view>
-						<text class="guige">已选:{{ selectArr.join(",") || i18n.selection }}</text>
+						<text class="guige">{{i18n.Selected}}:{{ selectArr.join(",") || i18n.selection }}</text>
 					</view>
 				</view>
 				<view class="" style="position: absolute; top: 48rpx; right: 28rpx" @click="close">
@@ -329,17 +330,17 @@
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 30rpx">
-					<text class="title1">数量</text>
+					<text class="title1">{{i18n.number}}</text>
 					<u-number-box v-model="value" @change="valChange"></u-number-box>
 				</view>
 				<view class="" style="height: 200rpx"></view>
 				<view class="bottoma">
 					<view v-if="shopcar == 0" class="btn" @click="joincart">
-						加入购物车
+						{{i18n.Addtocart}}
 					</view>
-					<view v-if="shopcar == 1" class="btn" @click="order"> 立即购买 </view>
+					<view v-if="shopcar == 1" class="btn" @click="order"> {{i18n.Buynow}} </view>
 					<view v-if="shopcar == 2" class="btn" @click="close">
-						确定
+						{{i18n.enter}}
 					</view>
 				</view>
 			</view>
@@ -390,18 +391,18 @@
 					<text class="info" style="font-size: 32rpx">
 						{{ i18n.shar }}
 					</text>
-					<image src="../static/images/index/bottom2.png" style="width: 40rpx; height: 40rpx">
+					<image  src="../static/images/index/bottom2.png" style="width: 40rpx; height: 40rpx">
 					</image>
 				</view>
 				<!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
 					
 				</view> -->
-				<view class="u-flex u-row-between" style="margin-top: 82rpx; padding: 0 140rpx">
-					<view class="" @click="copylink">
+				<view class="u-flex " style="margin-top: 82rpx; padding: 0 140rpx;justify-content: center;">
+<!-- 					<view class="" @click="copylink">
 						<image src="../static/images/index/link.png" style="width: 108rpx; height: 108rpx" mode="">
 						</image>
 						<view class="link">{{ i18n.Copylink }}</view>
-					</view>
+					</view> -->
 					<view class="" @click="builder">
 						<image src="../static/images/index/image.png" style="width: 108rpx; height: 108rpx" mode="">
 						</image>
@@ -430,7 +431,7 @@
 				css="text-align:center; padding-top: 20rpx;color:#F83224; font-size: 26rpx" />
 
 			<l-painter-text :text="goodinfoname" css=" padding-top: 20rpx;display:block" />
-			<l-painter-qrcode :text="'https://cbec.hdlkeji.com/cbec?id='+id"
+			<l-painter-qrcode :text="'https://cbec.hdlkeji.com/cbec?id='+id+'&userid='+userid"
 				css="width: 132rpx; height: 132rpx;margin-top:44rpx;margin-left:174rpx" />
 			<l-painter-text text="长按识别查看" css=" padding-top: 20rpx;text-align:center;display:block;color:#777777" />
 		</l-painter>
@@ -547,7 +548,8 @@
 				rate: 5,
 				content: {},
 				bao: '',
-				picture2: ''
+				picture2: '',
+				userid: ''
 			};
 		},
 		computed: {
@@ -556,6 +558,11 @@
 			},
 		},
 		onLoad(options) {
+			if (uni.getStorageSync('user_info')) {
+				var user_info = uni.getStorageSync('user_info')
+				this.userid = user_info.id
+				console.log(this.userid);
+			}
 			console.log(options);
 			if (options.q && options.q != "undefined") {
 				// 获取到二维码原始链接内容
@@ -834,7 +841,7 @@
 					console.log(this.selectArr.join(","));
 					if (ite.item == this.selectArr.join(",")) {
 						this.sku_info = ite;
-					} 
+					}
 				});
 				console.log(this.sku_info);
 			},

+ 3 - 1
unpackage/dist/build/mp-weixin/app.json

@@ -100,7 +100,9 @@
         "homepage/homepage",
         "ensureRecharge/ensureRecharge",
         "orderDetail/orderDetail",
-        "resultFeedback/resultFeedback"
+        "resultFeedback/resultFeedback",
+        "userAgreement/userAgreement",
+        "joinPlatfrom/joinPlatfrom"
       ]
     }
   ],

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss

@@ -1 +1 @@
-.iitem.data-v-a9b5715a{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-a9b5715a{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-a9b5715a{flex:1;width:474rpx;height:642rpx}.bottom.data-v-a9b5715a{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-a9b5715a{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}.title.data-v-a9b5715a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-a9b5715a{width:212rpx;height:642rpx}.ititle.data-v-a9b5715a{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-a9b5715a{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:right;font-style:normal}
+.iitem.data-v-34959586{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-34959586{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:right;font-style:normal}.right.data-v-34959586{flex:1;width:474rpx;height:642rpx}.bottom.data-v-34959586{width:750rpx;height:166rpx;background:#fff;padding:20rpx 24rpx;box-sizing:border-box}.btn.data-v-34959586{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}.title.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-34959586{width:212rpx;height:642rpx}.ititle.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:right;font-style:normal}.itime.data-v-34959586{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss

@@ -1 +1 @@
-.all.data-v-273ac4ac{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-273ac4ac{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-273ac4ac{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-273ac4ac{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-273ac4ac{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-273ac4ac{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-273ac4ac{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-4df7efb3{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-4df7efb3{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-4df7efb3{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-4df7efb3{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/changelange.js


文件差异内容过多而无法显示
+ 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-3732de12{padding:20rpx 24rpx;background-color:#fff!important;height:calc(100vh - 40rpx)}.page .btnleft.data-v-3732de12{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-3732de12{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-3732de12{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-3732de12{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-3732de12{width:36rpx;height:36rpx}
+.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}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/comment.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/comment.wxml

@@ -1 +1 @@
-<view class="back data-v-338b9728"><block wx:if="{{$root.g0>0}}"><view class="data-v-338b9728"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-338b9728"><view style="display:flex;justify-content:space-between;" class="data-v-338b9728"><view class="u-flex data-v-338b9728"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-338b9728"></image><view class="data-v-338b9728"><text class="name data-v-338b9728">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-338b9728" bind:__l="__l"></uni-rate></view></view><text class="day data-v-338b9728">{{item.m0}}</text></view><view class="day data-v-338b9728" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-338b9728" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-338b9728" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-338b9728"></image></block></view></block></view></block></view></block><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-338b9728">暂无数据</view></view>
+<view class="back data-v-c9b9cbfa"><block wx:if="{{$root.g0>0}}"><view class="data-v-c9b9cbfa"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-c9b9cbfa"><view style="display:flex;justify-content:space-between;" class="data-v-c9b9cbfa"><view class="u-flex data-v-c9b9cbfa"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-c9b9cbfa"></image><view class="data-v-c9b9cbfa"><text class="name data-v-c9b9cbfa">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-c9b9cbfa" bind:__l="__l"></uni-rate></view></view><text class="day data-v-c9b9cbfa">{{item.m0}}</text></view><view class="day data-v-c9b9cbfa" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-c9b9cbfa" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-c9b9cbfa" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-c9b9cbfa"></image></block></view></block></view></block></view></block><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-c9b9cbfa">{{''+i18n.nodata+''}}</view></view>

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

@@ -1 +1 @@
-.back.data-v-338b9728{padding:20rpx;box-sizing:border-box}.back .box.data-v-338b9728{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-338b9728{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-338b9728{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-338b9728{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}
+.back.data-v-c9b9cbfa{padding:20rpx;box-sizing:border-box}.back .box.data-v-c9b9cbfa{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-c9b9cbfa{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-c9b9cbfa{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-c9b9cbfa{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.wxss


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxss


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


文件差异内容过多而无法显示
+ 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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{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-2cf4bd4e{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-2cf4bd4e{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-2cf4bd4e{position:relative}.back .topbox .state.data-v-2cf4bd4e{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-2cf4bd4e{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-2cf4bd4e{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-290806e8{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-290806e8{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-290806e8{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-290806e8{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-290806e8{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-290806e8{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-290806e8{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-290806e8{position:relative}.back .topbox .state.data-v-290806e8{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-290806e8{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-290806e8{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/productdetails.js


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageA/productdetails.wxss


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/subsidy.js


文件差异内容过多而无法显示
+ 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-835d307a{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-835d307a{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-835d307a{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-835d307a{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-835d307a{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-835d307a{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-835d307a{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-835d307a{width:418rpx;height:68rpx}.box .item.data-v-835d307a{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-835d307a{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-835d307a{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-835d307a{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-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}

文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/delivery.js


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/delivery.wxml


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/goods.js


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageB/goods.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"17c8":function(t,n,e){"use strict";var u=e("8b11"),a=e.n(u);a.a},"3e9b":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},i=[]},"58a5":function(t,n,e){"use strict";e.r(n);var u=e("e7dd"),a=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);n["default"]=a.a},"67dc":function(t,n,e){"use strict";e.r(n);var u=e("3e9b"),a=e("58a5");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("17c8");var o,c=e("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"461f5271",null,!1,u["a"],o);n["default"]=r.exports},"8b11":function(t,n,e){},"9e36":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},a={components:{AllRight:u},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=a}).call(this,e("543d")["default"])}},[["9e36","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSetup/accountSetup"],{"58a5":function(t,n,e){"use strict";e.r(n);var u=e("e7dd"),a=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);n["default"]=a.a},"67dc":function(t,n,e){"use strict";e.r(n);var u=e("f982"),a=e("58a5");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("df67");var o,c=e("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"28d3f00e",null,!1,u["a"],o);n["default"]=r.exports},"9e36":function(t,n,e){"use strict";(function(t,n){var u=e("4ea4");e("f93b");u(e("66fd"));var a=u(e("67dc"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},df67:function(t,n,e){"use strict";var u=e("e349"),a=e.n(u);a.a},e349:function(t,n,e){},e7dd:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("pageC/mineComponent/allRight/allRight").then(function(){return resolve(e("edae"))}.bind(null,e)).catch(e.oe)},a={components:{AllRight:u},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.setup})},data:function(){return{userInfo:{}}},methods:{layout:function(){t.clearStorage(),t.navigateTo({url:"/pages/login/login"})},toNextPage:function(n){t.navigateTo({url:n})},getUserInfo:function(){var n=this;t.getStorage({key:"user_info",success:function(t){var e=t.data;n.userInfo=e}})}},mounted:function(){this.getUserInfo(),t.setNavigationBarTitle({title:this.i18n.setup})},created:function(){}};n.default=a}).call(this,e("543d")["default"])},f982:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return u}));var a=function(){var t=this,n=t.$createElement;t._self._c},i=[]}},[["9e36","common/runtime","common/vendor"]]]);

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/accountSetup/accountSetup.wxml


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

@@ -1 +1 @@
-.page.data-v-461f5271{padding:20rpx 24rpx}.page .set-top.data-v-461f5271{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-461f5271{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-461f5271{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-461f5271{font-size:36rpx}.page .set-top .address.data-v-461f5271{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-461f5271{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-461f5271{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-461f5271{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-461f5271{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-461f5271{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-461f5271{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-461f5271{width:32rpx;height:32rpx}.page .text-right.data-v-461f5271{display:flex;align-items:center}.page .text-right text.data-v-461f5271{font-size:30rpx;color:rgba(34,34,34,.5)}
+.page.data-v-28d3f00e{padding:20rpx 24rpx}.page .set-top.data-v-28d3f00e{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-top .information.data-v-28d3f00e{display:flex;justify-content:space-between;align-items:center;width:100%;height:176rpx}.page .set-top .information .information-lift.data-v-28d3f00e{display:flex;align-items:center}.page .set-top .information .information-lift .header-img.data-v-28d3f00e{border-radius:50%;height:116rpx;width:116rpx;margin-right:20rpx}.page .set-top .information .information-lift .name.data-v-28d3f00e{font-size:36rpx}.page .set-top .address.data-v-28d3f00e{display:flex;justify-content:space-between;height:106rpx;align-items:center;border-top:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-center.data-v-28d3f00e{margin-top:20rpx;background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .set-center .security.data-v-28d3f00e{display:flex;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2);justify-content:space-between;align-items:center}.page .set-center .switch.data-v-28d3f00e{display:flex;justify-content:space-between;height:104rpx;align-items:center}.page .set-bottom.data-v-28d3f00e{border-radius:16rpx;padding:0 20rpx;background-color:#fff;margin-top:20rpx}.page .set-bottom .text-1.data-v-28d3f00e{display:flex;justify-content:space-between;align-items:center;height:102rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .set-bottom .text-2.data-v-28d3f00e{display:flex;justify-content:space-between;align-items:center;height:102rpx}.page .layout.data-v-28d3f00e{border-radius:16rpx;background-color:#fff;color:#f83224;font-size:32rpx;height:92rpx;margin-top:20rpx}.page .right-icon.data-v-28d3f00e{width:32rpx;height:32rpx}.page .text-right.data-v-28d3f00e{display:flex;align-items:center}.page .text-right text.data-v-28d3f00e{font-size:30rpx;color:rgba(34,34,34,.5)}

+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"14a5":function(n,t,e){"use strict";var u=e("d339"),r=e.n(u);r.a},4017:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},a=[]},7538:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},methods:{}};t.default=u},b458:function(n,t,e){"use strict";e.r(t);var u=e("4017"),r=e("bc26");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("14a5");var c,f=e("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);t["default"]=i.exports},bc26:function(n,t,e){"use strict";e.r(t);var u=e("7538"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},d339:function(n,t,e){},f263:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var r=u(e("b458"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(r.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f263","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/ensureExplain/ensureExplain"],{"14a5":function(e,n,t){"use strict";var u=t("d339"),r=t.n(u);r.a},7538:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreementContent:""}},methods:{getAgreementContent:function(){var n=this;e.$u.http.get("/api/agreement?code=margin_rule").then((function(e){console.log(e),n.agreementContent=e}))}},mounted:function(){this.getAgreementContent()}};n.default=t}).call(this,t("543d")["default"])},b458:function(e,n,t){"use strict";t.r(n);var u=t("f4e5"),r=t("bc26");for(var a in r)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(a);t("14a5");var o,c=t("f0c5"),i=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],o);n["default"]=i.exports},bc26:function(e,n,t){"use strict";t.r(n);var u=t("7538"),r=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=r.a},d339:function(e,n,t){},f263:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var r=u(t("b458"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},f4e5:function(e,n,t){"use strict";t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"0d5f"))}},r=function(){var e=this,n=e.$createElement;e._self._c},a=[]}},[["f263","common/runtime","common/vendor"]]]);

+ 3 - 1
unpackage/dist/build/mp-weixin/pageC/ensureExplain/ensureExplain.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "保证金说明",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
+  }
 }

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

@@ -1 +1 @@
-<view class="page">本活动为好车主会员福利,会员每日可进入活动页面进行九宫格抽奖,每日登陆可获取等级匹配的基础抽奖次数,分享链接、好友打开链接、好友注册还可分别增加一次抽奖机会。<view>1、每日登陆获取的基础抽奖次数由会员等级决定,等级越高,抽奖次数越多(黄铜每日1次,白银、黄金铂金每日2次,钻石、黑钻每日3次)。</view><view>2、会员还可通过分享链接、好友打开链接、好友注册动作,额外增加一次抽奖机会。</view><view>3、赢取的奖励需在有效期内使用,活动奖励以活动页面显示为准。兑换详情请参考奖品兑换页,逾期未使用,视为放弃兑奖资格,奖品自动失效不再补发,且不予延期。</view><view>4、在参与活动过程中,如用户出现或涉嫌违法违规行为(例如洗钱、虚假交易、作弊、套现、赌博、作弊或刷信用、其他风险交易等),一经发现,好车主有权撤销用户活动参与资格和奖励使用资格,并有权回收用户已获得的奖励权益(包括已消费部分)。</view><view>5、好车主有权根据国家法律法规/监管规定/国家政策/市场风险/运营策略的变化,调整或变更本活动的运营规则亦或是提前终止本活动(如有)。相关变动或调整将公布在活动页面上,或以短信、页面消息、公告等合适的方式及时通知。如用户仍继续参与活动的,视为接受调整后的活动规则。</view></view>
+<view class="page"><u-parse vue-id="eb6a3088-1" content="{{agreementContent.content_cn}}" bind:__l="__l"></u-parse></view>

文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageC/internationalAddress/internationalAddress.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/privacyPolicy/privacyPolicy.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/privacyPolicy/privacyPolicy"],{"253b":function(t,n,e){"use strict";(function(t,n){var c=e("4ea4");e("f93b");c(e("66fd"));var u=c(e("c393"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"3d10":function(t,n,e){"use strict";e.r(n);var c=e("79bc"),u=e.n(c);for(var i in c)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return c[t]}))}(i);n["default"]=u.a},"79bc":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{}},computed:{i18n:function(){return this.$t("index")}},methods:{},mounted:function(){t.setNavigationBarTitle({title:this.i18n.privacy})}};n.default=e}).call(this,e("543d")["default"])},bcb9:function(t,n,e){"use strict";var c;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return c}));var u=function(){var t=this,n=t.$createElement;t._self._c},i=[]},c393:function(t,n,e){"use strict";e.r(n);var c=e("bcb9"),u=e("3d10");for(var i in u)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(i);var r,a=e("f0c5"),o=Object(a["a"])(u["default"],c["b"],c["c"],!1,null,null,null,!1,c["a"],r);n["default"]=o.exports}},[["253b","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/privacyPolicy/privacyPolicy"],{"253b":function(t,e,n){"use strict";(function(t,e){var c=n("4ea4");n("f93b");c(n("66fd"));var a=c(n("c393"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(a.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},"3d10":function(t,e,n){"use strict";n.r(e);var c=n("79bc"),a=n.n(c);for(var i in c)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(i);e["default"]=a.a},"79bc":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{agreement:""}},computed:{i18n:function(){return this.$t("index")}},methods:{getAgreement:function(){var e=this;t.$u.http.get("/api/agreement?code=private").then((function(t){e.agreement=t.content_cn}))}},mounted:function(){this.getAgreement(),t.setNavigationBarTitle({title:this.i18n.privacy})}};e.default=n}).call(this,n("543d")["default"])},ace1:function(t,e,n){"use strict";var c;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return c}));var a=function(){var t=this,e=t.$createElement;t._self._c},i=[]},c393:function(t,e,n){"use strict";n.r(e);var c=n("ace1"),a=n("3d10");for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);var r,u=n("f0c5"),o=Object(u["a"])(a["default"],c["b"],c["c"],!1,null,null,null,!1,c["a"],r);e["default"]=o.exports}},[["253b","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-<view>隐私政策</view>
+<view><rich-text nodes="{{agreement}}"></rich-text></view>

文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pageD/orderInformation/orderInformation.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.wxml


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

@@ -1 +1 @@
-.page.data-v-0b7cc713{background-color:#fff;padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-0b7cc713{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-0b7cc713{color:#f83224}.page .top-fail.data-v-0b7cc713{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-0b7cc713{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-0b7cc713{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-0b7cc713{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-0b7cc713{width:100%;height:750rpx}.page .price.data-v-0b7cc713{color:#f83224;margin-top:36rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-0b7cc713{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-0b7cc713{font-size:28rpx;margin-top:84rpx;padding-left:40rpx}.page .detail.data-v-0b7cc713{padding:24rpx 20rpx}.page .detail .detail-img.data-v-0b7cc713{width:100%}.page .footer.data-v-0b7cc713{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-0b7cc713{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}
+.page.data-v-fa25d110{padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-fa25d110{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-fa25d110{color:#f83224}.page .top-fail.data-v-fa25d110{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-fa25d110{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-fa25d110{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-fa25d110{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-fa25d110{width:100%;height:750rpx}.page .title-price.data-v-fa25d110{background-color:#fff;width:96%;margin:0 auto;border-radius:16rpx;padding-bottom:36rpx;margin-top:20rpx;padding-top:10rpx}.page .price.data-v-fa25d110{color:#f83224;margin-top:6rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-fa25d110{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-fa25d110{font-size:28rpx;padding-left:40rpx;background-color:#fff;width:90%;margin:0 auto;margin-top:40rpx;border-radius:16rpx 16rpx 0 0;padding-top:30rpx}.page .detail.data-v-fa25d110{padding:24rpx 20rpx;background-color:#fff;width:90%;margin:0 auto;border-radius:0 0 16rpx 16rpx}.page .detail .detail-img.data-v-fa25d110{width:100%}.page .footer.data-v-fa25d110{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-fa25d110{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/settleIn/settleIn.wxml


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

@@ -1 +1 @@
-.page.data-v-0346fc1a{padding:20rpx 24rpx}.page .content.data-v-0346fc1a{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-0346fc1a{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-0346fc1a{width:24rpx;height:24rpx}.page .btn.data-v-0346fc1a{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}
+.page.data-v-61453751{padding:20rpx 24rpx}.page .content.data-v-61453751{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-61453751{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-61453751{width:24rpx;height:24rpx}.page .btn.data-v-61453751{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}

文件差异内容过多而无法显示
+ 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 - 1
unpackage/dist/build/mp-weixin/pages/express/express.js


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/express/express.wxml


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/express/express.wxss


+ 2 - 2
unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

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

+ 2 - 2
unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

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

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/build/mp-weixin/uview-ui/components/u-parse/u-parse.js


+ 2 - 2
unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

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

文件差异内容过多而无法显示
+ 0 - 1
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 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/balance.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/counter.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/logisticsinfo.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoptype.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/ParcelExpress.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/Senderinfor.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/account.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/citychange.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/delivery.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map


文件差异内容过多而无法显示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map


部分文件因为文件数量过多而无法显示