zhaogongxue 7 месяцев назад
Родитель
Сommit
69545a1458
85 измененных файлов с 492 добавлено и 317 удалено
  1. 83 64
      commont/messages.js
  2. 6 5
      pageA/order.vue
  3. BIN
      pageA/static/images/qiang1.png
  4. BIN
      pageA/static/images/qiang2.png
  5. 7 1
      pageA/subsidy.vue
  6. 15 8
      pages/shopping/shopping.vue
  7. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  8. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  9. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  10. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  11. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Free1.png
  12. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Free2.png
  13. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Free3.png
  14. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Million.png
  15. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Millones1.png
  16. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/Millones2.png
  17. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/kg1.png
  18. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/kg2.png
  19. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/kg3.png
  20. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/recommend1.png
  21. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/recommend2.png
  22. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/recommend3.png
  23. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxml
  25. 1 1
      unpackage/dist/build/mp-weixin/pageA/subsidy.wxss
  26. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  27. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  28. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json
  29. 0 0
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.js
  30. 0 0
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxml
  31. 1 1
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxss
  32. BIN
      unpackage/dist/build/mp-weixin/static/shopping/shop1.png
  33. BIN
      unpackage/dist/build/mp-weixin/static/shopping/shop2.png
  34. BIN
      unpackage/dist/build/mp-weixin/static/shopping/shop3.png
  35. BIN
      unpackage/dist/build/mp-weixin/static/shopping/title2.png
  36. BIN
      unpackage/dist/build/mp-weixin/static/shopping/title3.png
  37. 2 2
      unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  42. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  43. 371 228
      unpackage/dist/dev/app-plus/app-view.js
  44. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Free1.png
  45. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Free2.png
  46. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Free3.png
  47. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Million.png
  48. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Millones1.png
  49. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/Millones2.png
  50. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/kg1.png
  51. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/kg2.png
  52. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/kg3.png
  53. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/recommend1.png
  54. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/recommend2.png
  55. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/recommend3.png
  56. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/yuyin-left.png
  57. BIN
      unpackage/dist/dev/app-plus/pageA/static/images/yuyin-right.png
  58. BIN
      unpackage/dist/dev/app-plus/static/express/label1.png
  59. BIN
      unpackage/dist/dev/app-plus/static/express/label2.png
  60. BIN
      unpackage/dist/dev/app-plus/static/express/label3.png
  61. BIN
      unpackage/dist/dev/app-plus/static/images/index/butie1.png
  62. BIN
      unpackage/dist/dev/app-plus/static/images/index/butie2.png
  63. BIN
      unpackage/dist/dev/app-plus/static/images/index/butie3.png
  64. BIN
      unpackage/dist/dev/app-plus/static/images/index/pinbao1.png
  65. BIN
      unpackage/dist/dev/app-plus/static/images/index/pinbao2.png
  66. BIN
      unpackage/dist/dev/app-plus/static/images/index/pinbao3.png
  67. BIN
      unpackage/dist/dev/app-plus/static/images/index/postage1.png
  68. BIN
      unpackage/dist/dev/app-plus/static/images/index/postage2.png
  69. BIN
      unpackage/dist/dev/app-plus/static/images/index/postage3.png
  70. BIN
      unpackage/dist/dev/app-plus/static/images/recommend.png
  71. BIN
      unpackage/dist/dev/app-plus/static/images/warning.png
  72. BIN
      unpackage/dist/dev/app-plus/static/shopping/shop1.png
  73. BIN
      unpackage/dist/dev/app-plus/static/shopping/shop2.png
  74. BIN
      unpackage/dist/dev/app-plus/static/shopping/shop3.png
  75. BIN
      unpackage/dist/dev/app-plus/static/shopping/title2.png
  76. BIN
      unpackage/dist/dev/app-plus/static/shopping/title3.png
  77. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  78. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.js
  79. 0 1
      unpackage/dist/dev/mp-weixin/pageA/order.json
  80. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.wxml
  81. BIN
      unpackage/dist/dev/mp-weixin/pageA/static/images/qiang1.png
  82. BIN
      unpackage/dist/dev/mp-weixin/pageA/static/images/qiang2.png
  83. 0 0
      unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml
  84. 0 0
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml
  85. 0 0
      unpackage/dist/dev/mp-weixin/project.private.config.json

+ 83 - 64
commont/messages.js

@@ -310,46 +310,46 @@ export default {
 			grouping: '立即拼团',
 			Selected: '已选',
 			Buynow: '立即购买',
-			closeaccount:'确定要注销账号吗?',
-			other:'其他',
-			store:'店铺',
-			
+			closeaccount: '确定要注销账号吗?',
+			other: '其他',
+			store: '店铺',
 
-			sales:'售前售后 安心无忧购物',
-			album:'保存到相册',
-			identify:'长按识别查看',
-			evaluate:'评价',
-			particulars:'详情',
-			savesuccessfully:'保存成功',
-			merchandiseNews:'商品信息',
-			shutdown:'取关成功',
-			Focus:'关注成功',
-			understock:'库存不足',
-			successfullyAdded:'添加成功',
-			Nofurtherdata:'已无更多数据',
-			Searchchat:'搜索聊天记录',
-			customerService:'官方客服',
-			picture:'图片',
-			voiceMessage:'语音消息',
-			return:'返回',
-			Marginpayment:'保证金支付',
-			itemtoSend:'请选择邮寄物品',
-			selectitemType:'请选择物品类型',
-			Weightnotlessthan:'重量不能小于',
-			cannotbelessthan:'数量不能小于',
-			Wechatlogin:'微信授权登录',
-			readandAgree:'我已阅读并同意',
-			useragreement:'用户协议',
-			Privacyagreement:'隐私协议',
-			offtheshelves:'商品下架',
-			top:'顶部',
-			Shiftfocus:'移入关注',
-			successfullydelete:'删除成功',
-			defaultTheme:'默认主题',
-			and:'和',
-			lowest:'低至',
-			discount:'折扣',
-			newcontainer:'请重新选择货柜'
+
+			sales: '售前售后 安心无忧购物',
+			album: '保存到相册',
+			identify: '长按识别查看',
+			evaluate: '评价',
+			particulars: '详情',
+			savesuccessfully: '保存成功',
+			merchandiseNews: '商品信息',
+			shutdown: '取关成功',
+			Focus: '关注成功',
+			understock: '库存不足',
+			successfullyAdded: '添加成功',
+			Nofurtherdata: '已无更多数据',
+			Searchchat: '搜索聊天记录',
+			customerService: '官方客服',
+			picture: '图片',
+			voiceMessage: '语音消息',
+			return: '返回',
+			Marginpayment: '保证金支付',
+			itemtoSend: '请选择邮寄物品',
+			selectitemType: '请选择物品类型',
+			Weightnotlessthan: '重量不能小于',
+			cannotbelessthan: '数量不能小于',
+			Wechatlogin: '微信授权登录',
+			readandAgree: '我已阅读并同意',
+			useragreement: '用户协议',
+			Privacyagreement: '隐私协议',
+			offtheshelves: '商品下架',
+			top: '顶部',
+			Shiftfocus: '移入关注',
+			successfullydelete: '删除成功',
+			defaultTheme: '默认主题',
+			and: '和',
+			lowest: '低至',
+			discount: '折扣',
+			newcontainer: '请重新选择货柜'
 		},
 	},
 	//英语
@@ -461,7 +461,7 @@ export default {
 			Searchcon: "you want to search for",
 			expensive: "Buy high Must compensate",
 			Something: "Global goodies",
-			postage: "Exempt from postage",
+			postage: "postage",
 			Trade: "Trade-in",
 			sort: "sort",
 			fill: "subsidy",
@@ -656,10 +656,10 @@ export default {
 			grouping: 'Join Group Now',
 			Selected: 'Selected',
 			Buynow: 'Buy Now',
-			closeaccount:'Are you sure you want to close your account?',
-			other:'other',
-			store:'store',
-			
+			closeaccount: 'Are you sure you want to close your account?',
+			other: 'other',
+			store: 'store',
+
 			sales: 'Pre-sales and after-sales, worry-free shopping',
 			album: 'Save to album',
 			identify: 'Long press to identify and view',
@@ -691,10 +691,10 @@ export default {
 			Shiftfocus: 'Shift to focus',
 			successfullydelete: 'Deleted successfully',
 			defaultTheme: 'Default theme',
-			and:'and',
-			lowest:'lowest',
-			discount:'discount',
-			newcontainer:'Please select a new container'
+			and: 'and',
+			lowest: 'lowest',
+			discount: 'discount',
+			newcontainer: 'Please select a new container'
 		},
 	},
 	// 西班牙
@@ -983,10 +983,10 @@ export default {
 			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',
-			closeaccount:'Seguro que desea cerrar su cuenta?',
-			other:'otros',
-			store:'trozos',
-			
+			closeaccount: 'Seguro que desea cerrar su cuenta?',
+			other: 'otros',
+			store: 'trozos',
+
 			sales: 'Ventas: Compra tranquila con atención antes y después de la venta',
 			album: 'Guardar en álbum',
 			identify: 'Presiona y mantén para identificar y ver',
@@ -1018,10 +1018,29 @@ export default {
 			Shiftfocus: 'Mover el enfoque',
 			successfullydelete: 'Eliminado con éxito',
 			defaultTheme: 'Tema predeterminado',
-			and:'y',
-			lowest:'mínimo',
-			discount:'descuento',
-			newcontainer:'Por favor, vuelva a seleccionar contenedor'
+			and: 'y',
+			lowest: 'mínimo',
+			discount: 'descuento',
+			newcontainer: 'Por favor, vuelva a seleccionar contenedor',
+
+			window: 'Por favor, haga clic en el icono flotante en la esquina superior derecha para copiar',
+			Recent: 'Recientemente utilizado',
+			nodata: 'No hay datos disponibles',
+			Pleasecountry: 'Por favor, seleccione un país',
+			container: 'Por favor, seleccione su contenedor',
+			skip: 'Omitir',
+			Login: 'Inicio de sesión exitoso',
+			selectcity: 'Por favor, seleccione una ciudad',
+			shippingaddress: 'Por favor, añada su dirección de envío',
+			shippingmethod: 'Por favor, seleccione el método de envío',
+			Followed: 'Siguiendo',
+			Addtocart: 'Añadir al carrito',
+			grouping: 'Únete al grupo de compras inmediatamente',
+			Selected: 'Seleccionado',
+			Buynow: 'Comprar ahora',
+			closeaccount: '¿Está seguro de que desea cerrar su cuenta?',
+			other: 'Otro',
+			store: 'Tienda',
 		},
 	},
 	//意大利
@@ -1325,10 +1344,10 @@ export default {
 			grouping: 'Unisciti al gruppo immediatamente',
 			Selected: 'Selezionato',
 			Buynow: 'Acquista ora',
-			closeaccount:'E’ sicuro di voler cancellare il numero di conto?',
-			other:'altri',
-			store:'Del negozio',
-			
+			closeaccount: 'E’ sicuro di voler cancellare il numero di conto?',
+			other: 'altri',
+			store: 'Del negozio',
+
 			sales: 'Pre-vendita e post-vendita, acquisti senza preoccupazioni',
 			album: 'Salva nell album',
 			identify: 'Tieni premuto per riconoscere e visualizzare',
@@ -1360,10 +1379,10 @@ export default {
 			Shiftfocus: 'Sposta la attenzione',
 			successfullydelete: 'Eliminato con successo',
 			defaultTheme: 'Tema predefinito',
-			and:'e',
-			lowest:'minimo',
-			discount:'sconti',
-			newcontainer:'Per favore riprendete il contenitore'
+			and: 'e',
+			lowest: 'minimo',
+			discount: 'sconti',
+			newcontainer: 'Per favore riprendete il contenitore'
 		},
 	},
 };

+ 6 - 5
pageA/order.vue

@@ -82,7 +82,7 @@
                       1000000
                 }}</text>
 							</view>
-							<u-number-box @change="valChange" v-model="value">
+<!-- 							<u-number-box @change="valChange" v-model="value">
 								<view slot="minus" class="">
 									<u-icon name="minus" size="12"></u-icon>
 								</view>
@@ -91,7 +91,8 @@
 								<view slot="plus" class="">
 									<u-icon name="plus" size="12"></u-icon>
 								</view>
-							</u-number-box>
+							</u-number-box> -->
+							<view class="">x{{value}}</view>
 						</view>
 					</view>
 				</view>
@@ -113,13 +114,13 @@
 				<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="">
+					style="width: 378rpx; height: 30rpx" mode="">
 				</image>
 				<image v-if="language == 'es-ES'" src="static/images/recommend2.png"
-					style="width: 200rpx; height: 30rpx" mode="">
+					style="width: 550rpx; height: 30rpx" mode="">
 				</image>
 				<image v-if="language == 'it-IT'" src="static/images/recommend3.png"
-					style="width: 200rpx; height: 30rpx" mode="">
+					style="width: 460rpx; height: 30rpx" mode="">
 				</image>
 			</view>
 			<view class="bottom">

BIN
pageA/static/images/qiang1.png


BIN
pageA/static/images/qiang2.png


+ 7 - 1
pageA/subsidy.vue

@@ -121,7 +121,13 @@
 								<text class='texttwo'>{{child.price.slice(-3)}}</text>
 							</view>
 							<view class="u-flex">
-								<image src="static/images/qiang.png" style="width: 48rpx;height: 38rpx;" mode="">
+								<image v-if="language =='zh-CN'" src="static/images/qiang.png" style="width: 48rpx;height: 38rpx;" mode="">
+								</image>
+								<image v-if="language =='en-US'" src="static/images/qiang1.png" style="width: 44rpx;height: 22rpx;" mode="">
+								</image>
+								<image v-if="language =='es-ES'" src="static/images/qiang2.png" style="width: 86rpx;height: 24rpx;" mode="">
+								</image>
+								<image v-if="language =='it-IT'" src="static/images/qiang1.png" style="width: 44rpx;height: 22rpx;" mode="">
 								</image>
 							</view>
 						</view>

+ 15 - 8
pages/shopping/shopping.vue

@@ -7,11 +7,14 @@
 			<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-if="language =='en-US'" 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 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 v-if="language =='it-IT'" src="/static/shopping/title3.png" style="width: 390rpx;height: 48rpx;"
+					mode="">
 				</image>
 			</view>
 		</u-navbar>
@@ -85,13 +88,17 @@
 									<text class="money">¥</text>
 									<text class="money" style="font-size: 40rpx;">{{item.goods.discount_price}}</text>
 								</view>
-								<image v-if="language =='zh-CN'" 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 v-if="language =='en-US'" src="/static/shopping/shop1.png"
+									style="width: 80rpx;height: 44rpx;" mode="">
 								</image>
-								<image v-if="language =='es-ES'" src="/static/shopping/shop2.png" style="width: 70rpx;height: 38rpx;" mode="">
+								<image v-if="language =='es-ES'" src="/static/shopping/shop2.png"
+									style="width: 74rpx;height: 20rpx;" mode="">
 								</image>
-								<image v-if="language =='it-IT'" src="/static/shopping/shop3.png" style="width: 100rpx;height: 38rpx;" mode="">
+								<image v-if="language =='it-IT'" src="/static/shopping/shop3.png"
+									style="width: 62rpx;height: 44rpx;" mode="">
 								</image>
 							</view>
 						</view>
@@ -163,7 +170,7 @@
 					if (this.page == 1) {
 						this.list = res.data
 					} else {
-						this.list =  this.list.concat(res.data)
+						this.list = this.list.concat(res.data)
 					}
 
 				}).catch(() => {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Разница между файлами не показана из-за своего большого размера
+ 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


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Free1.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Free2.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Free3.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Million.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Millones1.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/Millones2.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/kg1.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/kg2.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/kg3.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/recommend1.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/recommend2.png


BIN
unpackage/dist/build/mp-weixin/pageA/static/images/recommend3.png


Разница между файлами не показана из-за своего большого размера
+ 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-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#444;line-height:42rpx;text-align:left;font-style:normal;width:400rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.box.data-v-6f271d12{width:750rpx;height:1266rpx;background:#f4f4f4;border-radius:24rpx 24rpx 0rpx 0rpx;margin-top:36rpx;padding:32rpx;box-sizing:border-box}.box .baoyou.data-v-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fff;line-height:28rpx;text-align:left;font-style:normal}.box .textone.data-v-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.box .texttwo.data-v-6f271d12{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .textfour.data-v-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .backimg.data-v-6f271d12{width:418rpx;height:68rpx}.box .item.data-v-6f271d12{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-6f271d12{padding:0 8rpx;height:32rpx;border-radius:4rpx;border:1rpx solid #e5bc78;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#d48700;line-height:28rpx;text-align:center;font-style:normal}.input.data-v-6f271d12{width:458rpx;height:64rpx;background:#fdfcfb;border-radius:36rpx;padding:0 24rpx;box-sizing:border-box;margin-left:16rpx;display:flex;align-items:center}.biaopqian.data-v-6f271d12{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#fff;line-height:34rpx;text-align:left;font-style:normal}
+.titl.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:30rpx;color:#444;line-height:42rpx;text-align:left;font-style:normal;width:400rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.box.data-v-81a82ea4{width:750rpx;height:1266rpx;background:#f4f4f4;border-radius:24rpx 24rpx 0rpx 0rpx;margin-top:36rpx;padding:32rpx;box-sizing:border-box}.box .baoyou.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fff;line-height:28rpx;text-align:left;font-style:normal}.box .textone.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.box .texttwo.data-v-81a82ea4{font-family:HarmonyOS_Sans_Medium;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.box .textthree.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .textfour.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#fdfcfb;line-height:28rpx;text-align:left;font-style:normal}.box .backimg.data-v-81a82ea4{width:418rpx;height:68rpx}.box .item.data-v-81a82ea4{margin-top:36rpx;background:#fdfcfb;border-radius:16rpx;width:702rpx;padding:28rpx 16rpx;box-sizing:border-box}.box .tabs.data-v-81a82ea4{padding:0 8rpx;height:32rpx;border-radius:4rpx;border:1rpx solid #e5bc78;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#d48700;line-height:28rpx;text-align:center;font-style:normal}.input.data-v-81a82ea4{width:458rpx;height:64rpx;background:#fdfcfb;border-radius:36rpx;padding:0 24rpx;box-sizing:border-box;margin-left:16rpx;display:flex;align-items:center}.biaopqian.data-v-81a82ea4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#fff;line-height:34rpx;text-align:left;font-style:normal}

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

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

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

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

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

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/shopping/shopping.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxml


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

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

BIN
unpackage/dist/build/mp-weixin/static/shopping/shop1.png


BIN
unpackage/dist/build/mp-weixin/static/shopping/shop2.png


BIN
unpackage/dist/build/mp-weixin/static/shopping/shop3.png


BIN
unpackage/dist/build/mp-weixin/static/shopping/title2.png


BIN
unpackage/dist/build/mp-weixin/static/shopping/title3.png


+ 2 - 2
unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 371 - 228
unpackage/dist/dev/app-plus/app-view.js


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Free1.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Free2.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Free3.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Million.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Millones1.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/Millones2.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/kg1.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/kg2.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/kg3.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/recommend1.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/recommend2.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/recommend3.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/yuyin-left.png


BIN
unpackage/dist/dev/app-plus/pageA/static/images/yuyin-right.png


BIN
unpackage/dist/dev/app-plus/static/express/label1.png


BIN
unpackage/dist/dev/app-plus/static/express/label2.png


BIN
unpackage/dist/dev/app-plus/static/express/label3.png


BIN
unpackage/dist/dev/app-plus/static/images/index/butie1.png


BIN
unpackage/dist/dev/app-plus/static/images/index/butie2.png


BIN
unpackage/dist/dev/app-plus/static/images/index/butie3.png


BIN
unpackage/dist/dev/app-plus/static/images/index/pinbao1.png


BIN
unpackage/dist/dev/app-plus/static/images/index/pinbao2.png


BIN
unpackage/dist/dev/app-plus/static/images/index/pinbao3.png


BIN
unpackage/dist/dev/app-plus/static/images/index/postage1.png


BIN
unpackage/dist/dev/app-plus/static/images/index/postage2.png


BIN
unpackage/dist/dev/app-plus/static/images/index/postage3.png


BIN
unpackage/dist/dev/app-plus/static/images/recommend.png


BIN
unpackage/dist/dev/app-plus/static/images/warning.png


BIN
unpackage/dist/dev/app-plus/static/shopping/shop1.png


BIN
unpackage/dist/dev/app-plus/static/shopping/shop2.png


BIN
unpackage/dist/dev/app-plus/static/shopping/shop3.png


BIN
unpackage/dist/dev/app-plus/static/shopping/title2.png


BIN
unpackage/dist/dev/app-plus/static/shopping/title3.png


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.js


+ 0 - 1
unpackage/dist/dev/mp-weixin/pageA/order.json

@@ -3,7 +3,6 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-number-box": "/uview-ui/components/u-number-box/u-number-box",
     "u-popup": "/uview-ui/components/u-popup/u-popup"
   }
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.wxml


BIN
unpackage/dist/dev/mp-weixin/pageA/static/images/qiang1.png


BIN
unpackage/dist/dev/mp-weixin/pageA/static/images/qiang2.png


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/project.private.config.json


Некоторые файлы не были показаны из-за большого количества измененных файлов