Kaynağa Gözat

解决冲突

mabaoyi 9 ay önce
ebeveyn
işleme
0366693f1f
85 değiştirilmiş dosya ile 1702 ekleme ve 835 silme
  1. 284 26
      commont/messages.js
  2. 18 8
      components/kj-flow/kj-flow.vue
  3. 100 3
      components/kj-tabbar/kj-tabbar.vue
  4. 6 1
      pageA/chat/news.vue
  5. 10 5
      pageA/confirm.vue
  6. 12 7
      pageA/logisticsinfo.vue
  7. 25 20
      pageA/order.vue
  8. 14 9
      pageA/payorder.vue
  9. 109 13
      pageA/productdetails.vue
  10. 95 0
      pageA/rule/rule.vue
  11. 6 1
      pageA/service/service.vue
  12. 12 7
      pageA/subsidy.vue
  13. 25 19
      pageB/ParcelExpress.vue
  14. 1 1
      pageB/Senderinfor.vue
  15. 20 15
      pageB/account.vue
  16. 20 15
      pageB/delivery.vue
  17. 18 13
      pageB/end.vue
  18. 6 1
      pageB/expresstype.vue
  19. 2 8
      pageB/myPackage.vue
  20. 10 5
      pageB/orderinfo.vue
  21. 1 1
      pageB/recipientinfo.vue
  22. 8 3
      pageB/search.vue
  23. 10 1
      pages.json
  24. 78 33
      pages/cart/cart.vue
  25. 12 2
      pages/express/express.vue
  26. 126 91
      pages/index/index.vue
  27. 12 5
      pages/shopping/shopping.vue
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  52. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  53. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  54. 268 241
      unpackage/dist/dev/mp-weixin/common/vendor.js
  55. 84 28
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  56. 2 0
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.json
  57. 0 1
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.wxml
  58. 12 12
      unpackage/dist/dev/mp-weixin/pageB/index.js
  59. 12 12
      unpackage/dist/dev/mp-weixin/pageC/index.js
  60. 12 12
      unpackage/dist/dev/mp-weixin/pageD/index.js
  61. 19 12
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  62. 0 0
      unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
  63. 14 7
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  64. 0 0
      unpackage/dist/dev/mp-weixin/pages/express/express.wxml
  65. 25 8
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  66. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  67. 18 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  68. 2 2
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  69. 5 5
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  70. 9 3
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  71. 0 0
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml
  72. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  73. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  74. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  75. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
  76. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
  77. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  78. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  79. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  80. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js
  81. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
  82. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
  83. 14 14
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  84. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  85. 13 13
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js

+ 284 - 26
commont/messages.js

@@ -100,7 +100,7 @@ export default {
 			recipient: '新建收件人',
 			informat: '点击填写寄件地址信息',
 			informate: '点击填写收件地址信息',
-			addressbook: '地址',
+			addressbook: '地址簿',
 			select: '请选择物品信息',
 			//主页
 			search: '搜索',
@@ -184,12 +184,75 @@ export default {
 			Salesvolume: '销售量',
 			stroll: '逛逛',
 			article: '条',
-			
-			know:'我知道了',
-			shar:'分享',
-			Copylink:'复制链接',
-			Generatepicture:'生成图片',
-			Cancel:'取消'
+			know: '我知道了',
+			shar: '分享',
+			Copylink: '复制链接',
+			Generatepicture: '生成图片',
+			Cancel: '取消',
+			Paymentsuccess: '支付成功',
+			MyOrder: '可在“个人中心-我的订单”查看',
+			Vieworder: '查看订单',
+			Backtohomepage: '返回首页',
+			Channelspecification: '渠道说明',
+			Billingmode: "计费模式",
+			Chargeableweight: "计费重量",
+			Estimatedcost: '预估费用',
+			Itemtype: '物品类型',
+			Channelrule: '渠道规则',
+			Copiedpaste: '已复制,快去粘贴吧~',
+			Replicationfailure: '复制失败',
+			shelves: '当该商品有库存并上架时我们会通过微信消息提醒您',
+			Actual: '实付金额',
+			Balancepayment: '余额支付',
+			Currentbalance: '当前余额',
+			WechatPay: '微信支付',
+			applicable: '适用微信支付',
+			Customerservicepayment: '客服支付',
+			Contactpayment: '联系客服支付',
+			Paymentinstructions: '付款须知',
+			Confirmpayment: '确定付款',
+			Commodityamount: '商品金额',
+			Grosscommodityweight: '商品总重',
+			Costperkilogram: '每公斤费用',
+			freight: '运费',
+			subtotal: '小计',
+			Atotalof: '共',
+			Submitorder: '提交订单',
+			next: '下一步',
+			Shipmentdate: '发柜日期',
+			Estimatedtimeofarrival: '预计到达时间',
+			Workingday: '个工作日',
+			buy: '购买到',
+			morefavorable: '会更优惠',
+			Pleaseproductname: '请输入相关商品名称',
+			Goodgoods: '品质好货',
+			Saveeverything: '每款必省',
+			willpay: '买贵必赔',
+			Subsidized: '补贴价',
+			typeof: '类型',
+			weight: '重量',
+			number: '数量',
+			Immediatepayment: '立即支付',
+			readandagree: '我阅读并同意',
+			International: '国际快递服务协议',
+			Estimatedprice: '预估总价',
+			Marinetank: '号海运柜',
+			Expressservice: '快递服务',
+			Orderconfirmation: '确认下单',
+			successful: '下单成功',
+			pickpackage: "待快递员上门取件",
+			Ordertime: '下单时间',
+			switch: '更换',
+			Popularshipment: '热门寄件',
+
+			manage: '管理',
+			complete: '完成',
+			selectall: '全选',
+			Grossweight: '总重量',
+			GotoResult: '去结算',
+			orderpaysforitself: '坏单包赔',
+			Soldout: '已售',
+
 		}
 	},
 	"en-US": {
@@ -359,7 +422,6 @@ export default {
 			yes: 'yes',
 			Bottomprice: 'Bottom price',
 			highestprice: 'The highest price',
-
 			Discounted: 'Discounted price',
 			service: 'service',
 			Netcontent: 'Net content',
@@ -380,12 +442,77 @@ export default {
 			Salesvolume: 'Sales volume',
 			stroll: 'stroll',
 			article: 'article',
-			
-			know:'I know',
-			shar:'Share',
-			Copylink:'Copy link',
-			Generatepicture:'Generate picture',
-			Cancel:'Cancel'
+			know: 'I know',
+			shar: 'Share',
+			Copylink: 'Copy link',
+			Generatepicture: 'Generate picture',
+			Cancel: 'Cancel',
+
+			Paymentsuccess: 'Payment success',
+			MyOrder: 'It can be viewed in "Personal Center - My Order"',
+			Vieworder: 'View order',
+			Backtohomepage: 'Back to home page',
+			Channelspecification: 'Channel specification',
+			Billingmode: "Billing mode",
+			Chargeableweight: "Chargeable weight",
+			Estimatedcost: 'Estimated cost',
+			Itemtype: 'Item type',
+			Channelrule: 'Channel rule',
+			Copiedpaste: 'Copied, go paste ~',
+			Replicationfailure: 'Replication failure',
+			shelves: 'We will alert you via wechat message when the item is in stock and on the shelves',
+
+			Actual: 'Actual amount paid',
+			Balancepayment: 'Balance payment',
+			Currentbalance: 'Current balance',
+			WechatPay: 'Wechat Pay',
+			applicable: 'Wechat Pay is applicable',
+			Customerservicepayment: 'Customer service payment',
+			Contactpayment: 'Contact customer service payment',
+			Paymentinstructions: 'Payment instructions',
+			Confirmpayment: 'Firm payment',
+			Commodityamount: 'Commodity amount',
+			Grosscommodityweight: 'Gross commodity weight',
+			Costperkilogram: 'Cost per kilogram',
+			freight: 'freight',
+			subtotal: 'subtotal',
+			Atotalof: 'A total of',
+			Submitorder: 'Submit an order',
+			next: 'next',
+			Shipmentdate: 'Shipment date',
+			Estimatedtimeofarrival: 'Estimated time of arrival',
+			Workingday: 'Working day',
+			buy: 'buy',
+			morefavorable: 'Will be more favorable',
+			Pleaseproductname: 'Please enter the relevant product name',
+			Goodgoods: 'Good quality goods',
+			Saveeverything: 'Save everything',
+			willpay: 'If you buy, you will pay',
+			Subsidized: 'Subsidized price',
+
+			typeof: 'Type',
+			weight: 'Weight',
+			number: 'Number',
+			Immediatepayment: 'Immediate Payment',
+			readandagree: 'Read and Agree',
+			International: 'International',
+			Estimatedprice: 'Estimated Price',
+			Marinetank: 'Sea Freight Container',
+			Expressservice: 'Express Service',
+			Orderconfirmation: 'Order Confirmation',
+			successful: 'Successful',
+			pickpackage: 'Waiting for Courier Pickup',
+			Ordertime: 'Order Time',
+			switch: 'Switch',
+			Popularshipment: 'Popular Shipment',
+
+			manage: 'Management',
+			complete: 'Complete',
+			selectall: 'Select All',
+			Grossweight: 'Gross Weight',
+			GotoResult: 'Go to Checkout',
+			orderpaysforitself: 'Order Pays for Itself',
+			Soldout: 'Sold Out',
 		}
 	},
 	// 西班牙
@@ -578,12 +705,77 @@ export default {
 			Salesvolume: 'Volumen de ventas',
 			stroll: 'Los alrededores',
 			article: 'Art',
-			
-			know:'Lo sé',
-			shar:'compartir',
-			Copylink:'Copiar el enlace',
-			Generatepicture:'Generar una imagen',
-			Cancel:'cancelación'
+			know: 'Lo sé',
+			shar: 'compartir',
+			Copylink: 'Copiar el enlace',
+			Generatepicture: 'Generar una imagen',
+			Cancel: 'cancelación',
+
+			Paymentsuccess: 'Pago realizado con éxito',
+			MyOrder: 'Disponible en personal center - mis pedidos',
+			Vieworder: 'Ver el pedido',
+			Backtohomepage: 'Volver al inicio',
+			Channelspecification: 'Descripción del canal',
+			Billingmode: "Modelo de facturación",
+			Chargeableweight: "Peso facturable",
+			Estimatedcost: 'Estimación de gastos',
+			Itemtype: 'Tipos de artículos',
+			Channelrule: 'Reglas del canal',
+			Copiedpaste: 'Ya copiado, ir y pegar',
+			Replicationfailure: 'Falla en copiar',
+			shelves: 'Le recordaremos a través del mensaje de wechat cuando el artículo está en stock y en estante',
+
+			Actual: 'Cantidad a pagar',
+			Balancepayment: 'Pago del saldo',
+			Currentbalance: 'Balance actual',
+			WechatPay: 'Pago con wechat',
+			applicable: 'Pago wechat aplicable',
+			Customerservicepayment: 'Servicio al cliente pago',
+			Contactpayment: 'Contacto servicio al cliente pago',
+			Paymentinstructions: 'Notas de pago',
+			Confirmpayment: 'Determine su pago',
+			Commodityamount: 'Cantidad de bienes',
+			Grosscommodityweight: 'Peso total de la mercancía',
+			Costperkilogram: 'Coste por kg',
+			freight: 'El flete',
+			subtotal: 'subtotal',
+			Atotalof: 'total',
+			Submitorder: 'Enviar un pedido',
+			next: 'Siguiente paso',
+			Shipmentdate: 'Fecha del gabinete de salida',
+			Estimatedtimeofarrival: 'Hora estimada de llegada',
+			Workingday: 'Días laborables',
+			buy: 'Comprar hasta',
+			morefavorable: 'Será mejor',
+			Pleaseproductname: 'Por favor ingrese el nombre comercial relevante',
+			Goodgoods: 'Productos de buena calidad',
+			Saveeverything: 'Cada estilo debe ahorrar',
+			willpay: 'Comprar caro, pagar',
+			Subsidized: 'Precio subvencionado',
+
+			typeof: 'tipo',
+			weight: 'peso',
+			number: 'número',
+			Immediatepayment: 'pago inmediato',
+			readandagree: 'he leído y acepto',
+			International: 'internacional',
+			Estimatedprice: 'precio estimado',
+			Marinetank: 'contenedor marítimo',
+			Expressservice: 'servicio de expreso',
+			Orderconfirmation: 'confirmación de pedido',
+			successful: 'exitoso',
+			pickpackage: 'esperando recogida del mensajero',
+			Ordertime: 'hora del pedido',
+			switch: 'cambio',
+			Popularshipment: 'envío popular',
+
+			manage: 'gestionar',
+			complete: 'completar',
+			selectall: 'seleccionar todo',
+			Grossweight: 'peso bruto',
+			GotoResult: 'ir al pago',
+			orderpaysforitself: 'compensación por pedidos defectuosos',
+			Soldout: 'agotado',
 		}
 	},
 	//意大利
@@ -776,12 +968,78 @@ export default {
 			Salesvolume: 'Volume delle vendite',
 			stroll: 'gira',
 			article: 'articolo',
-			
-			know:'Io so che',
-			shar:'condividere',
-			Copylink:'Riproduzione di un link',
-			Generatepicture:'Creazione di immagini',
-			Cancel:'soppressione'
+
+			know: 'Io so che',
+			shar: 'condividere',
+			Copylink: 'Riproduzione di un link',
+			Generatepicture: 'Creazione di immagini',
+			Cancel: 'soppressione',
+
+			Paymentsuccess: 'Pagamenti eseguiti',
+			MyOrder: 'Disponibile presso il centro personale',
+			Vieworder: 'Controllare l’ordine',
+			Backtohomepage: 'Ritorno alla pagina iniziale',
+			Channelspecification: 'Descrizione dei canali',
+			Billingmode: "Modelli di fatturazione",
+			Chargeableweight: "Peso della fatturazione",
+			Estimatedcost: 'Oneri stimati',
+			Itemtype: 'Tipo di articolo',
+			Channelrule: 'Regolamentazione del canale',
+			Copiedpaste: 'Già copiato. Andiamo a fare affissione',
+			Replicationfailure: 'Fallimento della riproduzione',
+			shelves: 'Vi ricorderemo tramite wechat quando la merce è in stock e si mette sul mercato',
+
+			Actual: 'Importo versato',
+			Balancepayment: 'Pagamenti del saldo',
+			Currentbalance: 'Saldo delle partite correnti',
+			WechatPay: 'Pagamento tramite wechat',
+			applicable: 'Si applicano i pagamenti di wechat',
+			Customerservicepayment: 'Retribuzione del trasporto passeggeri',
+			Contactpayment: 'Contatti con i clienti pagamento',
+			Paymentinstructions: 'Avvisi di pagamento',
+			Confirmpayment: 'Determinazione dei pagamenti',
+			Commodityamount: 'Volume delle merci',
+			Grosscommodityweight: 'Peso totale delle merci',
+			Costperkilogram: 'Onere per kg',
+			freight: 'nolo',
+			subtotal: 'Totale parziale',
+			Atotalof: 'total',
+			Submitorder: 'Presentazione delle ordinazioni',
+			next: 'Le fasi successive',
+			Shipmentdate: 'Data di spedizione',
+			Estimatedtimeofarrival: 'Orario d’arrivo previsto',
+			Workingday: 'Giorni lavorativi',
+			buy: 'acquisti',
+			morefavorable: 'Più favorevole',
+			Pleaseproductname: 'Indicare il nome commerciale',
+			Goodgoods: 'Prodotti di qualità',
+			Saveeverything: 'Ogni contributo sarà provinciale',
+			willpay: 'L’acquisto è a pagamento',
+			Subsidized: 'Prezzo sovvenzionato',
+
+			typeof: 'tipo',
+			weight: 'peso',
+			number: 'numero',
+			Immediatepayment: 'pagamento immediato',
+			readandagree: 'ho letto e accetto',
+			International: 'internazionale',
+			Estimatedprice: 'prezzo stimato',
+			Marinetank: 'container marittimo',
+			Expressservice: 'servizio di espressione',
+			Orderconfirmation: "conferma dell'ordine",
+			successful: 'riusciti',
+			pickpackage: 'in attesa della raccolta dal corriere',
+			Ordertime: "tempo dell'ordine",
+			switch: 'commutare',
+			Popularshipment: 'spedizione popolare',
+
+			manage: 'gestire',
+			complete: 'completare',
+			selectall: 'seleziona tutto',
+			Grossweight: 'peso lordo',
+			GotoResult: 'vai al checkout',
+			orderpaysforitself: 'risarcimento per gli ordini difettosi',
+			Soldout: 'esaurito',
 		}
 	}
 }

+ 18 - 8
components/kj-flow/kj-flow.vue

@@ -7,16 +7,16 @@
 		</view>
 		<view class="u-flex" style="margin-top: 56rpx;">
 			<scroll-view scroll-y="true" class="left">
-				<view v-for="(item,idx) in 6"
+				<view v-for="(item,idx) in 6" :key="idx" @click="changea(idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
-					:style="{background:idx==0? '':'#F7F7F7'}">
+					:style="{background:idx==leftchange? '':'#F7F7F7'}">
 					<view class="ititle">海运散货</view>
-					<view class="itime" v-if="idx==0">预计到货时间 </view>
-					<view class="itime" v-if="idx==0">2023-12-31</view>
+					<view class="itime" v-if="idx==leftchange">预计到货时间 </view>
+					<view class="itime" v-if="idx==leftchange">2023-12-31</view>
 				</view>
 			</scroll-view>
 			<scroll-view scroll-y="true" class="right" style="margin-left: 36rpx;">
-				<view v-for="(item,idx) in 6"
+				<view v-for="(item,idx) in 6" :key="idx" @click="change(idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;" class="iitem">
 					<view class="ititle u-flex u-row-between" style="width: 100%;" >
 						<view class="ititle">发柜时间 2023-12-15</view>
@@ -28,8 +28,8 @@
 							<text style='font-size="32rpx"'>12</text>
 							<text style='font-size="28rpx"'>kg</text>
 						</view>
-						<u-icon v-if="idx==0" name="checkbox-mark" color="rgba(248, 50, 36, 1)" size="28"></u-icon>
-						<view v-else class=""></view>
+						<u-icon v-if="idx==rightchange" name="checkbox-mark" color="rgba(248, 50, 36, 1)" size="28"></u-icon>
+						<view v-else class="" style="width: 28px;height: 28px;"></view>
 					</view>
 				</view>
 			</scroll-view>
@@ -46,7 +46,8 @@
 		name: "kj-flow",
 		data() {
 			return {
-
+				leftchange:0,
+				rightchange:0,
 			};
 		},
 		computed: {
@@ -55,6 +56,15 @@
 			}
 		},
 		methods:{
+			//左边切换
+			changea(index){
+				this.leftchange = index
+				console.log(this.leftchange);
+			},
+			//右边切换
+			change(idx){
+				this.rightchange = idx
+			},
 			close(){
 				this.$emit('close')
 			},

+ 100 - 3
components/kj-tabbar/kj-tabbar.vue

@@ -1,6 +1,28 @@
 <template>
-	<view style="position: relative;z-index: 1000;">
-		<u-tabbar :list="list" :fixed="true" :safeAreaInsetBottom="true" active-color="#F83224" inactive-color="#333"
+	<view id="tabber" style="position: fixed;z-index: 1000;bottom: 0;">
+		<view class="bottom u-flex u-row-between" v-if="value1==3">
+			<view class="u-flex">
+				<u-checkbox-group v-model="all" placement="column" @change="checkAll">
+					<u-checkbox shape="circle" :name="selectall">
+					</u-checkbox>
+				</u-checkbox-group>
+				<text class="all">{{i18n.selectall}}</text>
+			</view>
+			<view v-if="success==false" class="dle">
+				{{i18n.delete}}
+			</view>
+			<view class="u-flex" v-else>
+				<view class="">
+					<text class="allweight">{{i18n.Grossweight}} 50kg,</text>
+					<text class="sum">{{i18n.total}}:</text>
+					<text class='summon'>¥</text>
+					<text class='summon' style="font-size: 36rpx;">188</text>
+					<text class='summon'>.34</text>
+				</view>
+				<view class="settle" @click="account">{{i18n.GotoResult}}</view>
+			</view>
+		</view>
+		<u-tabbar :list="list"  active-color="#F83224" inactive-color="#333"
 			:value="value1">
 			<u-tabbar-item :text="item.text" v-for="(item,idx) in list" @click="click1" :key="idx">
 				<image style="width: 40rpx;height: 40rpx;" class="u-page__item__slot-icon" slot="inactive-icon"
@@ -21,6 +43,11 @@
 		props: {
 			value1: Number
 		},
+		computed:{
+			i18n(){
+				return this.$t("index")
+			}
+		},
 		data() {
 			return {
 				list: [{
@@ -60,8 +87,18 @@
 			// if (uni.getStorageSync('tabbar')!=1) {
 			// 	this.value1 = uni.getStorageSync('tabbar')
 			// }
+			// const dom = uni.createSelectorQuery("#tabber")
 		},
 		methods: {
+			account(){
+				uni.navigateTo({
+					url:'/pageA/order'
+				})
+			},
+			getLabelHeight() {
+				const dom = uni.createSelectorQuery("#tabber")
+				console.log(dom)
+			},
 			// click1(e) {
 			// 	this.value1 = e
 			// 	console.log(e);
@@ -167,6 +204,66 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.all{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #444444;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+
+		.allweight {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.sum {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.summon {
+			font-family: JDZhengHT, JDZhengHT;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #FF1515;
+			line-height: 30rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
+		.settle {
+			width: 176rpx;
+			height: 68rpx;
+			background: #F83224;
+			border-radius: 38rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #FFFFFF;
+			line-height: 68rpx;
+			text-align: center;
+			font-style: normal;
+			margin-left: 20rpx;
+		}
+	}
 </style>

+ 6 - 1
pageA/chat/news.vue

@@ -21,7 +21,7 @@
 			</view>
 		</view>
 		<view class="box " >
-			<view class="u-flex " style="margin-bottom: 26rpx;" v-for="(item,idx) in  6">
+			<view class="u-flex " style="margin-bottom: 26rpx;" v-for="(item,idx) in  6" @click="chat">
 				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
 				<view class="u-row-between"
 					style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
@@ -52,6 +52,11 @@
 				uni.navigateTo({
 					url:'/pageA/service/service'
 				})
+			},
+			chat(){
+				uni.navigateTo({
+					url:'/pageA/chat/chat'
+				})
 			}
 		}
 	}

+ 10 - 5
pageA/confirm.vue

@@ -4,10 +4,10 @@
 		<view class="u-row-center" style="display: flex;align-items: center;flex-direction: column;">
 			<image src="/pageA/static/images/success.png" style="width: 70rpx;height: 70rpx;margin-top: 152rpx;"
 				mode=""></image>
-			<view class="success">支付成功</view>
-			<view class="order">可在“个人中心-我的订单”查看</view>
-			<view class="look">查看订单</view>
-			<view class="index" @click="toindex">返回首页</view>
+			<view class="success">{{i18n.Paymentsuccess}}</view>
+			<view class="order">{{i18n.MyOrder}}</view>
+			<view class="look">{{i18n.Vieworder}}</view>
+			<view class="index" @click="toindex">{{i18n.Backtohomepage}}</view>
 		</view>
 	</view>
 </template>
@@ -19,12 +19,17 @@
 
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			toindex() {
 				uni.switchTab({
 					url: '/pages/index/index'
 				})
-			}
+			},
 		}
 	}
 </script>

+ 12 - 7
pageA/logisticsinfo.vue

@@ -2,26 +2,26 @@
 	<!-- 物流详情 -->
 	<view class="back">
 		<view class="top">
-			<view class="explain">渠道说明</view>
+			<view class="explain">{{i18n.Channelspecification}}</view>
 			<view class="u-flex u-row-between" style='margin-top:32rpx'>
-				<text class="mode">计费模式</text>
+				<text class="mode">{{i18n.Billingmode}}</text>
 				<text class='mode'>阶梯首重续费模式</text>
 			</view>
 			<view class="u-flex u-row-between" style='margin-top:32rpx'>
-				<text class='mode'>计费重量</text>
+				<text class='mode'>{{i18n.Chargeableweight}}</text>
 				<text class='mode'>30.00kg</text>
 			</view>
 			<view class="u-flex u-row-between" style='margin-top:32rpx'>
-				<text class='mode'>预估费用</text>
+				<text class='mode'>{{i18n.Estimatedcost}}</text>
 				<text class='mode'>¥2400.00</text>
 			</view>
 		</view>
 		<view class="top" style="margin-top: 20rpx;">
-			<view class="explain">物品类型</view>
+			<view class="explain">{{i18n.Itemtype}}</view>
 			<view class="" style='margin-top:32rpx'>
 				仅限普货,美国限重20kg(8kg以内未
 			</view>
-			<view style='margin-top:32rpx' class="explain">渠道规则</view>
+			<view style='margin-top:32rpx' class="explain">{{i18n.Channelrule}}</view>
 			<view class="" style='margin-top:32rpx'>
 				仅限普货,美国限重20kg(8kg以内未
 			</view>
@@ -35,7 +35,12 @@
 			return {
 
 			};
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 	}
 </script>
 

+ 25 - 20
pageA/order.vue

@@ -44,9 +44,9 @@
 		</view>
 		<!-- 物流 -->
 		<view class="logistics u-flex u-row-between">
-			<text style="font-weight: 600;">跨境物流</text>
+			<text style="font-weight: 600;">{{i18n.flow}}</text>
 			<view class="u-flex" @click="show = true">
-				<text class="change">请选择</text>
+				<text class="change">{{i18n.selection}}</text>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
 		</view>
@@ -71,28 +71,28 @@
 		<!-- 商品相关 -->
 		<view class="abount" style="margin-top: 20rpx;">
 			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
-				<view class="name">商品金额</view>
+				<view class="name">{{i18n.Commodityamount}}</view>
 				<view class="money">¥2642.5</view>
 			</view>
 			<view class="u-flex u-row-between">
-				<view class="name">商品总重</view>
+				<view class="name">{{i18n.Grosscommodityweight}}</view>
 				<view class="money">300kg</view>
 			</view>
 			<view class="back u-flex">
 				<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
-				<text style="margin-left: 12rpx;">购买到378-380kg单价¥21,会更优惠</text>
+				<text style="margin-left: 12rpx;">{{i18n.buy}}378-380kg{{i18n.price}}¥21,{{i18n.morefavorable}}</text>
 			</view>
 			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
-				<view class="name">每公斤费用</view>
+				<view class="name">{{i18n.Costperkilogram}}</view>
 				<view class="money">¥24</view>
 			</view>
 			<view class="u-flex u-row-between">
-				<view class="name">运费</view>
+				<view class="name">{{i18n.freight}}</view>
 				<view class="money">¥100.00</view>
 			</view>
 			<view class="zong u-flex u-row-right">
 				<view class="">
-					<text class="small">小计</text>
+					<text class="small">{{i18n.subtotal}}</text>
 					<text class="mon">¥2642.5</text>
 				</view>
 			</view>
@@ -100,19 +100,19 @@
 		<view class="" style="height: 166rpx;"></view>
 		<view class="btn u-flex u-row-right">
 			<view class="">
-				<text class="kg">39kg,</text>
-				<text>合计:</text>
+				<text class="kg">{{i18n.Atotalof}}39kg,</text>
+				<text>{{i18n.total}}:</text>
 				<text class="money">¥2792.5</text>
 			</view>
 			<view class="order" @click="topay">
-				提交订单
+				{{i18n.Submitorder}}
 			</view>
 		</view>
 		<!-- 跨境物流 -->
 		<u-popup :show="show" @close="close" @open="open" mode="bottom" closeIconPos='top-right' round='28'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;">
 				<view class="poptitle">
-					跨境物流
+					{{i18n.flow}}
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 60rpx;flex-wrap: wrap;">
 					<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in 6" @click="change(idx)"
@@ -123,7 +123,7 @@
 						<view class="wei">¥12/kg</view>
 					</view>
 				</view>
-				<view class="nextto" @click="next">下一步</view>
+				<view class="nextto" @click="next">{{i18n.next}}</view>
 			</view>
 		</u-popup>
 		<!-- 跨境物流下一步 -->
@@ -131,12 +131,12 @@
 			closeIconPos='top-right' round='28' bgColor='#F4F4F4'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;position: relative;">
 				<view class="poptitle">
-					跨境物流
+					{{i18n.flow}}
 				</view>
 				<!-- <scroll-view :scroll-y="true" style="500rpx"> -->
 				<view class="transport" style="margin-top: 32rpx;" @click="activea(idx)" v-for="(item,idx) in 5">
 					<view class="u-flex u-row-between">
-						<text class="yundate">发柜日期 2023-12-09</text>
+						<text class="yundate">{{i18n.Shipmentdate}} 2023-12-09</text>
 						<image v-if="datechan==idx" src="/pageA/static/images/active.png"
 							style="width: 36rpx;height: 36rpx;" mode=""></image>
 						<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx;height: 36rpx;"
@@ -146,7 +146,7 @@
 						<view class="chest">
 							<text>2号海运柜</text>
 							<text style="margin: 0 16rpx;">|</text>
-							<text>预计到达时间22个工作日</text>
+							<text>{{i18n.Estimatedtimeofarrival}}22{{i18n.Workingday}}</text>
 						</view>
 						<view class="mone">
 							<text>¥</text>
@@ -157,8 +157,8 @@
 				<!-- </scroll-view> -->
 				<view class="" style="height: 166rpx;"></view>
 				<view class="enbottom  u-flex u-row-between">
-					<view class="cancel" @click="close">取消</view>
-					<view class="confirm" @click="confirm">确定</view>
+					<view class="cancel" @click="close">{{i18n.Cancel}}</view>
+					<view class="confirm" @click="confirm">{{i18n.enter}}</view>
 				</view>
 			</view>
 		</u-popup>
@@ -176,6 +176,11 @@
 				datechan: ''
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			change(index) {
 				this.index = index
@@ -197,9 +202,9 @@
 				this.show1 = false
 			},
 			//提交订单
-			topay(){
+			topay() {
 				uni.navigateTo({
-					url:'/pageA/payorder'
+					url: '/pageA/payorder'
 				})
 			}
 		}

+ 14 - 9
pageA/payorder.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="u-row-center"
 				style="display: flex;flex-direction: column;align-items: center;margin-top: 56rpx;">
-				<view class="paysum">实付金额</view>
+				<view class="paysum">{{i18n.Actual}}</view>
 				<view class="numbe" style="margin-top: 40rpx;">
 					<text>¥</text>
 					<text style="font-size: 60rpx;font-weight: 500;">2792.5</text>
@@ -27,9 +27,9 @@
 				<image src="static/images/yuer.png" mode="" style="width: 40rpx;height: 40rpx;"></image>
 				<view class="u-flex u-row-between " style="margin-left: 20rpx;flex: 1;">
 					<view class="">
-						<view class="">余额支付</view>
+						<view class="">{{i18n.Balancepayment}}</view>
 						<view class="" style="margin-top: 10rpx;color: rgba(248, 50, 36, 1);">
-							当前余额:2387.5
+							{{i18n.Currentbalance}}:2387.5
 						</view>
 					</view>
 					<image v-if="mode==0" src="static/images/active.png" mode="" style="width: 36rpx;height: 36rpx;">
@@ -42,9 +42,9 @@
 				<image src="static/images/wx.png" mode="" style="width: 40rpx;height: 40rpx;"></image>
 				<view class="u-flex u-row-between " style="margin-left: 20rpx;flex: 1;">
 					<view class="">
-						<view class="">微信支付</view>
+						<view class="">{{i18n.WechatPay}}</view>
 						<view class="" style="margin-top: 10rpx;color: rgba(121, 121, 121, 1)">
-							适用微信支付
+							{{i18n.applicable}}
 						</view>
 					</view>
 					<image v-if='mode==1' src="static/images/active.png" mode="" style="width: 36rpx;height: 36rpx;">
@@ -57,9 +57,9 @@
 				<image src="static/images/kefu2.png" mode="" style="width: 40rpx;height: 40rpx;"></image>
 				<view class="u-flex u-row-between " style="margin-left: 20rpx;flex: 1;">
 					<view class="">
-						<view class="">客服支付</view>
+						<view class="">{{i18n.Customerservicepayment}}</view>
 						<view class="" style="margin-top: 10rpx;color: rgba(121, 121, 121, 1)">
-							联系微信支付
+							{{i18n.Contactpayment}}
 						</view>
 					</view>
 					<image v-if='mode==2' src="static/images/active.png" mode="" style="width: 36rpx;height: 36rpx;">
@@ -70,11 +70,11 @@
 		</view>
 		<!-- 付款须知 -->
 		<view class="">
-			<view class="payment" style="margin-top: 24rpx;">付款须知</view>
+			<view class="payment" style="margin-top: 24rpx;">{{i18n.Paymentinstructions}}</view>
 			<view class="content" style="margin-top: 18rpx;">1.联系客服付款需走线下支付通道,付款成</view>
 		</view>
 		<view class="confirm" @click="confirm">
-			确认支付
+			{{i18n.Confirmpayment}}
 		</view>
 	</view>
 </template>
@@ -96,6 +96,11 @@
 				}]
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			change(idx) {
 				this.mode = idx

+ 109 - 13
pageA/productdetails.vue

@@ -9,9 +9,15 @@
 						:inactiveStyle="{
 						color:' #666666' }"></u-tabs>
 				</view>
+				<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
+					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
+				</view> -->
+			</view>
+			<view class="u-nav-slot u-flex" slot="right" style="display: flex;">
 				<view class="" style="margin-left: 184rpx;" @click="share = true">
 					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view>
+				<view class="" style="width: 180rpx;"></view>
 			</view>
 		</u-navbar>
 		<!-- 商品图片 -->
@@ -99,7 +105,19 @@
 					{{i18n.Recommended}}
 				</view>
 				<view class="">
-					<image src="" mode=""></image>
+					<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
+						<swiper-item v-for="(parent,index) in 4" :key="index">
+							<view class="u-flex  swiper-item u-row-between">
+								<view class="" v-for="child in 3" @click="toinfo(child.id)">
+									<image src="/static/images/logo.png" style="width: 214rpx;height: 214rpx;" mode=""></image>
+									<view class="u-line-1" style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;">布兰德烘焙猫粮预售鲜肉乌骨鸡囤货</view>
+									<view class="">
+										<span style="color:rgba(204, 51, 0, 1) ;margin-top: 12rpx;font-size: 26rpx;">¥{{child.price||235.55}}</span>
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
 				</view>
 			</view>
 			<view class="recommend">
@@ -184,7 +202,7 @@
 				</view>
 				<view class="" style="height: 200rpx;"></view>
 				<view class="bottoma">
-					<view class="btn">
+					<view class="btn" @click="joincart">
 						加入购物车
 					</view>
 				</view>
@@ -236,7 +254,7 @@
 						</image>
 						<view class="link">{{i18n.Copylink}}</view>
 					</view>
-					<view class="">
+					<view class="" @click="builder">
 						<image src="../static/images/index/image.png" style="width: 108rpx;height: 108rpx;" mode="">
 						</image>
 						<view class="link">{{i18n.Generatepicture}}</view>
@@ -247,6 +265,24 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-popup :show="imagea" bgColor=' rgba(244, 244, 244, 0);' mode='center' :customStyle="{alignItems: 'center'}" >
+			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(255, 255, 255, 1);border-radius: 16rpx;width: 538rpx;">
+				<view class="" style="">
+					<image src="../static/images/index/bottom2.png" style="width: 490rpx;height: 490rpx;">
+				</view>
+				<view class="money">
+					<span>¥</span>
+					<span style="font-size: 36rpx;">258</span>
+					<span>00</span>
+				</view>
+				<view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
+				<view class="" style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 44rpx;">
+					<image src="../static/images/logo.png" style="width: 132rpx;height: 132rpx;" mode=""></image>
+					<view class="view">长按识别查看</view>
+				</view>
+			</view>
+			<view class="button" style="width: 658rpx;">保存到相册</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -254,13 +290,16 @@
 	export default {
 		data() {
 			return {
+				imagea: false,
 				list1: [{
-					name: '商品',
-				}, {
-					name: '评价',
-				}, {
-					name: '详情'
-				}],
+						name: '商品',
+					}
+					// , {
+					// 	name: '评价',
+					// }, {
+					// 	name: '详情'
+					// },
+				],
 				current: 0,
 				// 购物车
 				show: false,
@@ -269,6 +308,7 @@
 				//分享
 				share: false,
 				value: 0, //步进器的值
+				swiptlist: []
 			};
 		},
 		computed: {
@@ -277,6 +317,29 @@
 			}
 		},
 		methods: {
+			//生成图片弹窗
+			builder(){
+				this.imagea = true
+				this.share = false
+			},
+			//获取推荐
+			getSeriesBooks() {
+				this.swiptlist = res.data.reduce((a, b) => {
+					let lastIndex = a.length - 1
+					if (a[lastIndex].length < 3) {
+						a[lastIndex].push(b)
+					} else {
+						a.push([b])
+					}
+					return a
+				}, [
+					[]
+				])
+			},
+			//加入购物车
+			joincart() {
+				this.show = false
+			},
 			valChange(e) {
 				console.log('当前值为: ' + e.value)
 			},
@@ -292,7 +355,7 @@
 			//通知
 			inform() {
 				uni.showToast({
-					title: '当该商品有库存并上架时我们会通过微信消息提醒您',
+					title: this.i18n.shelves,
 					icon: 'none',
 					duration: 2000
 				});
@@ -307,13 +370,13 @@
 					data: text,
 					success: () => {
 						uni.showToast({
-							title: '已复制,快去粘贴吧~',
+							title: this.i18n.Copiedpaste,
 							duration: 2000
 						});
 					},
 					fail: () => {
 						uni.showToast({
-							title: '复制失败',
+							title: this.i18n.Replicationfailure,
 							icon: 'none',
 							duration: 2000
 						});
@@ -325,6 +388,34 @@
 </script>
 
 <style lang="scss" scoped>
+	.money{
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 20rpx;
+		color: #F83224;
+		line-height: 26rpx;
+		text-align: left;
+		font-style: normal;
+	}
+	.title{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 16rpx;
+	}
+	.view{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #777777;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 12rpx;
+	}
 	.actabs {
 		width: 116rpx;
 		height: 68rpx;
@@ -586,7 +677,7 @@
 			}
 
 			.goshop {
-				width: 108rpx;
+				// width: 108rpx;
 				height: 52rpx;
 				border-radius: 26rpx;
 				border: 1rpx solid #FF1515;
@@ -597,6 +688,8 @@
 				line-height: 52rpx;
 				text-align: center;
 				font-style: normal;
+				padding: 0 20rpx;
+				box-sizing: border-box;
 			}
 		}
 
@@ -763,4 +856,7 @@
 			}
 		}
 	}
+	::v-deep .u-popup__content data-v-17becaea{
+		align-items: center !important;
+	}
 </style>

+ 95 - 0
pageA/rule/rule.vue

@@ -0,0 +1,95 @@
+<template>
+	<div class="product-specifications">
+		<view class="">{{all}}</view>
+	</div>
+</template>
+
+<script>
+import { nextTick } from 'vue';
+	export default {
+		data() {
+			return {
+				arr: [
+					['黑色', '白色', '蓝色'],
+					['8GB', '16GB', '32GB'],
+					['大', '中', '小']
+				],
+				all: [],
+				allArray: [{
+					name: '颜色',
+					size: ['白色', '红色', '黑色'],
+				}, {
+					name: '尺寸',
+					size: ['X', 'XL', 'XXL']
+				}],
+				rule:[]
+			};
+		},
+		mounted() {
+			let colorArray = ['白色', '红色', '黑色'] //选择的颜色
+			let sizeArray = ['X', 'XL', 'XXL'] //选择的尺寸
+			//组合数组 格式为:[[],[]]
+			this.fun()
+		
+			
+		},
+		methods: {
+			// fun() {
+			// 	var obj = {}
+			// 	this.allArray.forEach((item) => {
+			// 		item.size.forEach((a) => {
+			// 			obj = {[item.name]: a}
+			// 			obj[item.name]
+			// 			console.log(this.allArray);    
+			// 		})
+			// 	})
+			// },
+			
+			fun(){
+				this.all = this.allArray.map(item => {
+				  // 将每个size数组中的元素转换为对象形式
+				  const transformedSize = item.size.map(size => ({ [item.name]: size }));
+				  // 返回更新后的对象
+				  return {
+				    size: transformedSize
+				  };
+				});
+				
+				this.$nextTick(()=>{
+					const rule = this.cartesianProductOf(this.all); //调用笛卡尔积方法
+				})
+				// console.log(this.all);   
+			},
+
+
+			cartesianProductOf: function() { //笛卡尔积
+				return Array.prototype.reduce.call(arguments, function(a, b) {
+					var ret = [];
+					console.log(a);
+					a.forEach(function(a) {
+						b.forEach(function(b) {
+							ret.push(a.concat([b]));
+						});
+					});
+					return ret;
+				}, [
+					[]
+				]);
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.spec-item {
+		margin: 10px;
+	}
+
+	.combinations-list {
+		margin-top: 20px;
+	}
+
+	.combination-item {
+		margin: 5px 0;
+	}
+</style>

+ 6 - 1
pageA/service/service.vue

@@ -3,7 +3,7 @@
 	<view>
 		<u-navbar title="在线客服" :safeAreaInsetTop="true" :placeholder='true'>
 			<view class="u-nav-slot u-flex" slot="left">
-				<u-icon name="arrow-left" size="19"></u-icon>
+				<u-icon @click="retu" name="arrow-left" size="19"></u-icon>
 				<image src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
 				</image>
 			</view>
@@ -23,6 +23,11 @@
 			return {
 
 			};
+		},
+		methods:{
+			retu(){
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

+ 12 - 7
pageA/subsidy.vue

@@ -8,7 +8,7 @@
 				<u-icon name="arrow-left" size="19" color='rgba(253, 252, 251, 1)'></u-icon>
 				<view class="input">
 					<u-icon name="search" color="rgba(153, 153, 153, 1)" size="32"></u-icon>
-					<input type="text" placeholder="请输入相关商品名称" />
+					<input type="text" :placeholder="Pleaseproductname" />
 				</view>
 			</view>
 		</u-navbar>
@@ -19,11 +19,11 @@
 			<image src="static/images/goshop.png" style="width: 382rpx;height: 52rpx;" mode=""></image>
 			<!-- 			<image src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image> -->
 			<view class="biaopqian" style="margin-top: 20rpx;">
-				<text>品质好货</text>
+				<text>{{i18n.Goodgoods}}</text>
 				<text style='margin-left:20rpx;margin-right:20rpx'>|</text>
-				<text>每款必省</text>
+				<text>{{i18n.Saveeverything}}</text>
 				<text style='margin-left:20rpx;margin-right:20rpx'>|</text>
-				<text>买贵必赔</text>
+				<text>{{i18n.willpay}}</text>
 			</view>
 		</view>
 		<!-- 商品 -->
@@ -45,7 +45,7 @@
 							<text class="tabs baoyou"
 								style="background:rgba(248, 50, 36, 1) ;border: 2rpx solid rgba(248, 50, 36, 0);color:#FFFFFF ;">包邮</text>
 							<text class="tabs" v-for="(item,idx) in 3" :key="idx">
-								买贵必赔
+								{{i18n.willpay}}
 							</text>
 						</view>
 					</view>
@@ -70,7 +70,7 @@
 						<view class="u-flex u-row-between"
 							style="position: relative;z-index: 1;padding:0 24rpx ;text-align: center;line-height: 68rpx;">
 							<view class="">
-								<text class="textone">补贴价</text>
+								<text class="textone">{{i18n.Subsidized}}</text>
 								<text class='texttwo' style="margin-left: 12rpx;">¥</text>
 								<text class='texttwo' style="font-size: 40rpx;">16</text>
 								<text class='texttwo'>.13</text>
@@ -110,7 +110,12 @@
 					name: '手工'
 				}]
 			};
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 	}
 </script>
 

+ 25 - 19
pageB/ParcelExpress.vue

@@ -15,22 +15,22 @@
 			<view class="entrepot">
 				<view class="entre u-flex u-row-between">
 					<text class="title">普通包裹|海运散货</text>
-					<view class="change">更换</view>
+					<view class="change">{{i18n.switch}}</view>
 				</view>
 				<view class="box u-row-around u-flex">
 					<view class="flexc">
 						<view class="entrepotname">东莞仓库</view>
-						<view class="adda">始发地</view>
+						<view class="adda">{{i18n.Starting}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
 						<view class="entrepotname">澳大利亚</view>
-						<view class="adda">目的地</view>
+						<view class="adda">{{i18n.destination}}</view>
 					</view>
 				</view>
 				<view class="timea">
-					<text>开始时间:2023-12-31</text>
-					<text>/截止时间:2023-12-31</text>
+					<text>{{i18n.start}}:2023-12-31</text>
+					<text>{{i18n.cut}}:2023-12-31</text>
 				</view>
 			</view>
 			<!-- 地址 -->
@@ -44,12 +44,12 @@
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建寄件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -62,12 +62,12 @@
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建收件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -76,11 +76,11 @@
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">物品信息</text>
-						<view class="mast">必填</view>
+						<text class="wupin">{{i18n.item}}</text>
+						<view class="mast">{{i18n.required}}</view>
 					</view>
 					<view class="u-flex">
-						<text class="change">请选择物品信息</text>
+						<text class="change">{{i18n.selection}}</text>
 						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
 							mode=""></image>
 					</view>
@@ -90,7 +90,7 @@
 			<view class="next  u-flex-between" style="display: flex;">
 				<view class="" style="flex: 1;">
 					<view class="sum">
-						<text>预估总价</text>
+						<text>{{i18n.Estimatedprice}}</text>
 						<text style="color: rgba(248, 50, 36, 1);">¥ - -</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
@@ -99,12 +99,12 @@
 							<u-checkbox :customStyle="{marginBottom: '8px',marginTop:'5px'}" :name="deal">
 							</u-checkbox>
 						</u-checkbox-group>
-						<text>我阅读并同意</text>
-						<text style="color: rgba(248, 50, 36, 1);">《国际快递服务协议》</text>
+						<text>{{i18n.readandagree}}</text>
+						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
 					</view>
 				</view>
 				<view class="tonext " style="">
-					下一步
+					{{i18n.next}}
 				</view>
 			</view>
 		</view>
@@ -122,6 +122,11 @@
 		onLoad(options) {
 
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);
@@ -297,7 +302,8 @@
 		}
 
 		.mast {
-			width: 62rpx;
+			// width: 62rpx;
+			padding: 0 10rpx;
 			height: 30rpx;
 			border-radius: 16rpx;
 			border: 1rpx solid #F83224;

+ 1 - 1
pageB/Senderinfor.vue

@@ -62,7 +62,7 @@
 		</view>
 		<view class="bottom">
 			<view class="btn">
-				确定
+				{{i18n.enter}}
 			</view>
 		</view>
 	</view>

+ 20 - 15
pageB/account.vue

@@ -26,13 +26,13 @@
 					</view>
 				</view>
 				<view class="topinfo" style="margin-top: 26rpx;">
-					<text class='toptype'>类型:</text>
+					<text class='toptype'>{{i18n.typeof}}:</text>
 					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>日用品</text>
 					<text class='toptype' style='margin:0 14rpx'>|</text>
-					<text class='toptype'>重量:</text>
+					<text class='toptype'>{{i18n.weight}}:</text>
 					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>30.00kg</text>
 					<text class='toptype' style='margin:0 14rpx'> |</text>
-					<text class='toptype'>数量:</text>
+					<text class='toptype'>{{i18n.number}}:</text>
 					<text class='toptype' style='color:rgba(34, 34, 34, 1)'>20件</text>
 				</view>
 			</view>
@@ -47,12 +47,12 @@
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建寄件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -65,12 +65,12 @@
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建收件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -82,12 +82,12 @@
 				<view class="box u-row-around u-flex">
 					<view class="flexc">
 						<view class="entrepotname">东莞仓库</view>
-						<view class="adda">始发地</view>
+						<view class="adda">{{i18n.Starting}}</view>
 					</view>
 					<image src="/pageB/static/images/arrows.png" style="width: 130rpx;height: 10rpx;" mode=""></image>
 					<view class="flexc">
 						<view class="entrepotname">澳大利亚</view>
-						<view class="adda">目的地</view>
+						<view class="adda">{{i18ndestination}}</view>
 					</view>
 				</view>
 			</view>
@@ -95,7 +95,7 @@
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">物品信息</text>
+						<text class="wupin">{{i18n.item}}</text>
 					</view>
 					<view class="u-flex">
 						<text class="chang">30kg</text>
@@ -103,7 +103,7 @@
 				</view>
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">单价</text>
+						<text class="wupin">{{i18n.price}}</text>
 					</view>
 					<view class="u-flex">
 						<text class="chang">¥24</text>
@@ -111,7 +111,7 @@
 				</view>
 				<view class="info u-flex u-row-right">
 					<view class="u-flex">
-						<text class="wupin">小计:</text>
+						<text class="wupin">{{i18n.subtotal}}:</text>
 					</view>
 					<view class="u-flex">
 						<text class="chang" style="color: rgba(248, 50, 36, 1);">¥</text>
@@ -122,7 +122,7 @@
 			<view class="" style="height: 166rpx;"></view>
 			<!-- 下一步 -->
 			<view class="next  u-flex-between" style="display: flex;">
-				<view class="gopay">立即支付</view>
+				<view class="gopay">{{i18n.Immediatepayment}}</view>
 			</view>
 		</view>
 	</view>
@@ -139,6 +139,11 @@
 		onLoad(options) {
 
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);

+ 20 - 15
pageB/delivery.vue

@@ -23,12 +23,12 @@
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建寄件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -41,12 +41,12 @@
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建收件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -55,11 +55,11 @@
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">物品信息</text>
-						<view class="mast">必填</view>
+						<text class="wupin">{{i18n.item}}</text>
+						<view class="mast">{{i18n.required}}</view>
 					</view>
 					<view class="u-flex">
-						<text class="change">请选择物品信息</text>
+						<text class="change">{{i18n.select}}</text>
 						<image src="/static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
@@ -67,10 +67,10 @@
 				<!-- 跨境物流 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">跨境物流</text>
+						<text class="wupin">{{i18n.flow}}</text>
 					</view>
 					<view class="u-flex">
-						<text class="change" style="color: rgba(248, 50, 36, 1);">请选择</text>
+						<text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text>
 						<image src="/static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
@@ -80,7 +80,7 @@
 			<view class="next  u-flex-between" style="display: flex;">
 				<view class="" style="flex: 1;">
 					<view class="sum">
-						<text>预估总价</text>
+						<text>{{i18n.Estimatedprice}}</text>
 						<text style="color: rgba(248, 50, 36, 1);">¥ - -</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
@@ -88,12 +88,12 @@
 							<u-checkbox :customStyle="{marginBottom: '8px',marginTop:'5px'}" :name="deal" >
 							</u-checkbox>
 						</u-checkbox-group>
-						<text>我阅读并同意</text>
-						<text style="color: rgba(248, 50, 36, 1);">《国际快递服务协议》</text>
+						<text>{{i18n.readandagree}}</text>
+						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
 					</view>
 				</view>
 				<view class="tonext " style="">
-					下一步
+					{{i18n.next}}
 				</view>
 			</view>
 		</view>
@@ -111,6 +111,11 @@
 		onLoad(options) {
 
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);

+ 18 - 13
pageB/end.vue

@@ -27,18 +27,18 @@
 				</view>
 				<view class="boxinfo">
 					<view class="">
-						<text class="abouta">类型:</text>
+						<text class="abouta">{{i18n.typeof}}:</text>
 						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>日用品</text>
 						<text class="abouta" style='margin:0 16rpx'>|</text>
-						<text class="abouta">重量:</text>
+						<text class="abouta">{{i18n.weight}}:</text>
 						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>30.00kg</text>
 						<text class="abouta" style='margin:0 16rpx'>|</text>
-						<text class="abouta">数量:</text>
+						<text class="abouta">{{i18n.number}}:</text>
 						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>20件</text>
 					</view>
 					<view class="" style="margin-top: 20rpx;">
-						<text class="abouta">跨境物流:</text>
-						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>号海运柜</text>
+						<text class="abouta">{{i18n.flow}}:</text>
+						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>{{i18n.Marinetank}}</text>
 					</view>
 				</view>
 			</view>
@@ -53,12 +53,12 @@
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建寄件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.sender}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -71,12 +71,12 @@
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
 						<view class="u-row-between " style="">
-							<view class="pople">新建收件人</view>
-							<view class="jiadd" style="margin-top: 14rpx;">点击填写寄件地址信息</view>
+							<view class="pople">{{i18n.recipient}}</view>
+							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
-							<text class="right">地址簿</text>
+							<text class="right">{{i18n.addressbook}}</text>
 						</view>
 					</view>
 				</view>
@@ -85,7 +85,7 @@
 			<view class="wup u-flex u-row-between">
 				<view>快递服务</view>
 				<view class="u-flex" @click="toexpress">
-					<view>{{expname||'请选择'}}</view>
+					<view>{{expname||i18n.selection}}</view>
 					<image src="../static/express/next1.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
 				</view>
 			</view>
@@ -106,7 +106,7 @@
 					</view>
 				</view> -->
 				<view class="tonext " style="">
-					确认下单
+					{{i18n.Orderconfirmation}}
 				</view>
 			</view>
 		</view>
@@ -125,6 +125,11 @@
 		onLoad(options) {
 
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);

+ 6 - 1
pageB/expresstype.vue

@@ -11,7 +11,7 @@
 		</view>
 		<view class="bottom">
 			<view class="btn" @click="toteach">
-				确定
+				{{i18n.enter}}
 			</view>
 		</view>
 	</view>
@@ -40,6 +40,11 @@
 				],
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			toteach() {
 				const eventChannel = this.getOpenerEventChannel();

+ 2 - 8
pageB/myPackage.vue

@@ -48,7 +48,7 @@
 						<view class="btn">{{i18n.Frozen}}</view>
 						<view class="btn">{{i18n.details}}</view>
 						<!-- <view class="btn">{{i18n.recover}}</view> -->
-<!-- 						<view class="btn"
+						<!-- 						<view class="btn"
 							style="background-color:rgba(248, 50, 36, 1) ;color: #fff;border: 2rpx solid rgba(248, 50, 36, 0);">
 							{{i18n.payment}}
 						</view>
@@ -68,13 +68,7 @@
 		data() {
 			return {
 				current: 0, //tab切换
-				list1: [{
-					name: '发往中转点 4',
-				}, {
-					name: '中转已签收 12',
-				}, {
-					name: '正发往海外 2'
-				}]
+				list1: []
 			};
 		},
 		onLoad(options) {

+ 10 - 5
pageB/orderinfo.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="back">
 		<view class="top u-flex u-row-between">
-			<text class="success">下单成功</text>
-			<text class="sun">待快递员上门取件</text>
+			<text class="success">{{i18n.successful}}</text>
+			<text class="sun">{{i18n.pickpackage}}</text>
 		</view>
 		<view class="address">
 			<view class="" style="margin-top: 44rpx;">
@@ -28,11 +28,11 @@
 		</view>
 		<view class="orderinfo">
 			<view class="num">
-				<text class='num'>订单编号:</text>
+				<text class='num'>{{i18n.OrderNumber}}:</text>
 				<text class='num'>JDV18873891934</text>
 			</view>
 			<view class="num" style="margin-top: 50rpx;">
-				<text class='num'>下单时间::</text>
+				<text class='num'>{{i18n.Ordertime}}::</text>
 				<text class='num'>2023-12-03 22:44:15</text>
 			</view>
 		</view>
@@ -45,7 +45,12 @@
 			return {
 
 			};
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 	}
 </script>
 

+ 1 - 1
pageB/recipientinfo.vue

@@ -74,7 +74,7 @@
 		<view class="" style="height: 166rpx;"></view>
 		<view class="bottom">
 			<view class="btn">
-				确定
+				{{i18n.enter}}
 			</view>
 		</view>
 	</view>

+ 8 - 3
pageB/search.vue

@@ -6,11 +6,11 @@
 				<u-search @blur='blur' @focus='focus' @click="search" placeholder="请输入物品名称" v-model="keyword"
 					:showAction='false'></u-search>
 			</view>
-			<text @click="clear" v-if="keyword==''">取消</text>
-			<text @click="enter" v-else>确认</text>
+			<text @click="clear" v-if="keyword==''">{{i18n.Cancel}}</text>
+			<text @click="enter" v-else>{{i18n.enter}}</text>
 		</view>
 		<view v-if="blurshow==false && keyword==''" class="title" style="margin-top: 32rpx;">
-			热门寄件
+			{{i18n.Popularshipment}}
 		</view>
 		<view v-if="blurshow==false && keyword==''" class="u-flex " style="column-gap: 20rpx;flex-wrap: wrap;">
 			<view class="tabs" v-for="(item,idx) in 8" :key="idx" @click="select">
@@ -31,6 +31,11 @@
 				blurshow: false, //是否显示热门寄件
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			//取消
 			clear() {

+ 10 - 1
pages.json

@@ -85,7 +85,8 @@
 					"path": "counter",
 					"style": {
 						"navigationBarTitleText": "物流报价计算器",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": false,
+						"navigationBarTitleFontSize":20
 					}
 				},
 				{
@@ -154,6 +155,14 @@
 						"navigationBarTitleText" : "",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "rule/rule",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
 				}
 			]
 		},

+ 78 - 33
pages/cart/cart.vue

@@ -4,14 +4,14 @@
 		<u-navbar :safeAreaInsetTop="true" :placeholder='true'>
 			<view class="u-nav-slot" slot="left">
 				<view class="">
-					<text class="shopcart">购物车</text>
+					<text class="shopcart">{{i18n.Shopping}}</text>
 					<text class="sum">(12)</text>
 				</view>
 			</view>
 			<view class="u-nav-slot" slot="right">
 				<view class="u-flex">
-					<text @click="admin" v-if="success">管理</text>
-					<text @click="admin" v-else>完成</text>
+					<text @click="admin" v-if="success">{{i18n.manage}}</text>
+					<text @click="admin" v-else>{{i18n.complete}}</text>
 					<view class="" style="width: 200rpx;"></view>
 				</view>
 			</view>
@@ -28,15 +28,21 @@
 						<view class="u-flex" style="margin-top: 30rpx;width: 100%;" v-for="(chid,index) in 2"
 							:key="index">
 							<u-swipe-action-item :options="options2">
+								<!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
 								<u-checkbox shape='circle' :customStyle="{marginBottom: '8px'}" :name="shopitem">
 								</u-checkbox>
-								<image src="../../static/images/logo.png" style="width: 172rpx;height: 172rpx;" mode="">
-								</image>
+								<view class="" style="position: relative;width: 172rpx;height: 172rpx;">
+									<image src="/static/images/logo.png" style="width: 172rpx;height: 172rpx;" mode="">
+									</image>
+									<!-- 		<view class="sold">
+										商品下架
+									</view> -->
+								</view>
 								<view class="good" style="flex: 1;">
 									<view class="goodname">布兰德超级锁鲜全价主食冻干成</view>
 									<view class="goods">兔肉味-提高免疫 主食白金包</view>
 									<view class="" style="margin-top: 21rpx;">
-										<view class="goodtab">包邮</view>
+										<view class="goodtab">{{i18n.postage}}</view>
 									</view>
 									<view class="u-flex u-row-between" style="width: 100%;margin-top: 20rpx;">
 										<view class="">
@@ -46,8 +52,22 @@
 											<text class="weight">500g</text>
 										</view>
 										<view class="">
+											<!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
 											<view class="" v-if="num&&success">
-												<u-number-box v-model="value" @change="valChange"></u-number-box>
+												<!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
+												<u-number-box v-model="value">
+
+													<view slot="minus" class="minus">
+														<u-icon name="minus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+													<text slot="input"
+														style="width: 50px;text-align: center;font-size: 20rpx;"
+														class="input">{{value}}</text>
+													<view slot="plus" class="plus">
+														<u-icon name="plus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+
+												</u-number-box>
 											</view>
 											<view class="num" v-if="num==false&&success" @click="num = true">
 												x1
@@ -64,31 +84,8 @@
 				</view>
 			</view>
 		</u-checkbox-group>
-		<view class="" style="height: 140rpx;"></view>
-		<view class="bottom u-flex u-row-between" style="position: fixed;left: 0;z-index: 222;"
-			:style="{bottom:tabarheight + 'px'}">
-			<view class="u-flex">
-				<u-checkbox-group v-model="all" placement="column" @change="checkAll">
-					<u-checkbox shape="circle" :name="selectall">
-					</u-checkbox>
-				</u-checkbox-group>
-				<text>全选</text>
-			</view>
-			<view v-if="success==false" class="dle">
-				删除
-			</view>
-			<view class="u-flex" v-else>
-				<view class="">
-					<text class="allweight">总重量 50kg,</text>
-					<text class="sum">合计:</text>
-					<text class='summon'>¥</text>
-					<text class='summon' style="font-size: 36rpx;">188</text>
-					<text class='summon'>.34</text>
-				</view>
-				<view class="settle">去结算</view>
-			</view>
-		</view>
-		<kj-tabbar  :value1=3></kj-tabbar>
+		<view class="" style="height: 260rpx;"></view>
+		<kj-tabbar ref="tabbar1" :value1=3></kj-tabbar>
 	</view>
 </template>
 
@@ -96,6 +93,7 @@
 	export default {
 		data() {
 			return {
+				dele: true,
 				success: true,
 				shopitem: -1,
 				checkboxValue1: [], //商品数组
@@ -117,6 +115,11 @@
 				tabarheight: ''
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		onLoad() {
 			const systemInfo = wx.getSystemInfoSync()
 			console.log(systemInfo);
@@ -136,14 +139,56 @@
 			checkAll(e) {
 				console.log('all', e);
 			},
+			aaa() {
+				console.log(this.$refs.tabbar1.getLabelHeight())
+			},
 			checkboxChange(n) {
 				console.log('change', n);
 			}
-		}
+		},
+		mounted() {}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.sold {
+		width: 108rpx;
+		height: 36rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		// padding: 0 14rpx;
+		text-align: center;
+		box-sizing: border-box;
+		line-height: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		font-style: normal;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -18rpx;
+		margin-left: -54rpx;
+
+	}
+
+	.delect {
+		// width: 68rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 22rpx;
+		border: 1rpx solid #FF1515;
+		padding: 0 14rpx;
+		box-sizing: border-box;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #FF1515;
+		text-align: center;
+		font-style: normal;
+	}
+
 	.allweight {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

+ 12 - 2
pages/express/express.vue

@@ -7,9 +7,9 @@
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
 			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :safeAreaInsetTop="true"
-				style="position: absolute;z-index: 110;">
+				>
 				<view class="u-nav-slot" slot="left" style="display: flex;">
-					<image src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
+					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
 					</image>
 					<image @click="counter" src="../../static/images/index/compile.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
@@ -199,6 +199,7 @@
 			</view>
 		</u-popup>
 		<!-- <u-button @click="show = true">打开</u-button> -->
+		<view class="" style="height: 160rpx;"></view>
 		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
@@ -262,6 +263,12 @@
 					url: '/pageA/counter'
 				})
 			},
+			//消息
+			tochat(){
+				uni.navigateTo({
+					url:'/pageA/chat/news'
+				})
+			},
 			//物品信息
 			goods() {
 				uni.navigateTo({
@@ -306,6 +313,9 @@
 </script>
 
 <style lang="scss" scoped>
+		page{
+			background-color: rgba(0,0,0,0)
+		}
 	.pop {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;

+ 126 - 91
pages/index/index.vue

@@ -1,17 +1,17 @@
 <template>
 	<!-- 商城 -->
 	<view class="">
-
+		<!-- <view class="index-navbar"> -->
 		<view style="position: relative;">
 			<!-- 自定义导航栏 -->
 			<image src="../../static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;" mode=""></image>
-			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :fixed='true'
-				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
+			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :fixed='true'>
 				<view class="u-nav-slot" slot="left" style="display: flex;">
-					<image src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
+					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
+						style="width: 40rpx;height: 40rpx;">
 					</image>
-					<image src="../../static/images/index/compile.png" mode=""
+					<image @click="counter" src="../../static/images/index/compile.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
 					<image src="../../static/images/index/dianhua.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
@@ -49,16 +49,51 @@
 					<u-swiper radius='10' :indicator='true' :list="banner"></u-swiper>
 				</view>
 			</view>
-			<view class="shopback">
-				<view class="u-flex u-row-between">
-					<view class="bigbox">
+		</view>
+		<!-- </view> -->
+		<view class="shopback">
+			<view class="u-flex u-row-between">
+				<view class="bigbox">
+					<view class="u-flex">
+						<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;" mode="">
+						</image>
+						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
+					</view>
+					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+						<view v-for="(item,idx) in 4" class="ssbox  " style="margin-top: 16rpx;">
+							<view class="" style="position: relative">
+								<image src=""
+									style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
+									mode=""></image>
+								<view class="u-flex u-row-center"
+									style="position: absolute;bottom: 10rpx;width: 144rpx;">
+									<view class="u-flex">
+										<view class="tag u-flex" style="background: rgba(243, 93, 34, 1);">
+											<image src="../../static/images/index/down.png"
+												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+												mode="">
+											</image>
+											<text>{{15 + i18n.RMB}}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="money" style="text-align: center;">
+								¥59
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<view class="smallbox">
 						<view class="u-flex">
-							<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;"
+							<image src="../../static/images/index/pinbao.png" style="width: 164rpx;height: 26rpx;"
 								mode=""></image>
-							<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
+							<view class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.expensive}}
+							</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-							<view v-for="(item,idx) in 4" class="ssbox  " style="margin-top: 16rpx;">
+							<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 16rpx;">
 								<view class="" style="position: relative">
 									<image src=""
 										style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
@@ -66,7 +101,11 @@
 									<view class="u-flex u-row-center"
 										style="position: absolute;bottom: 10rpx;width: 144rpx;">
 										<view class="u-flex">
-											<view class="tag u-flex" style="background: rgba(243, 93, 34, 1);">
+											<!-- 												<image src="../../static/images/index/label.png"
+													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
+													mode="">
+												</image> -->
+											<view class="tag u-flex" style="background-color: rgba(251, 73, 70, 1);">
 												<image src="../../static/images/index/down.png"
 													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 													mode="">
@@ -76,99 +115,62 @@
 										</view>
 									</view>
 								</view>
-								<view class="money" style="text-align: center;">
-									¥59
-								</view>
 							</view>
 						</view>
 					</view>
-					<view class="">
-						<view class="smallbox">
-							<view class="u-flex">
-								<image src="../../static/images/index/pinbao.png" style="width: 164rpx;height: 26rpx;"
-									mode=""></image>
-								<view class="biaoqian" style="background: rgba(255, 148, 21, 1);">{{i18n.expensive}}
-								</view>
-							</view>
-							<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-								<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 16rpx;">
-									<view class="" style="position: relative">
-										<image src=""
-											style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
-											mode=""></image>
-										<view class="u-flex u-row-center"
-											style="position: absolute;bottom: 10rpx;width: 144rpx;">
-											<view class="u-flex">
-												<!-- 												<image src="../../static/images/index/label.png"
-													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-													mode="">
-												</image> -->
-												<view class="tag u-flex" style="background-color: rgba(251, 73, 70, 1);">
-													<image src="../../static/images/index/down.png"
-														style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
-														mode="">
-													</image>
-													<text>{{15 + i18n.RMB}}</text>
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
+					<view class="smallbox">
+						<view class="u-flex">
+							<image src="../../static/images/index/postage.png" style="width: 116rpx;height: 26rpx;"
+								mode=""></image>
+							<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
 						</view>
-						<view class="smallbox">
-							<view class="u-flex">
-								<image src="../../static/images/index/postage.png" style="width: 116rpx;height: 26rpx;"
-									mode=""></image>
-								<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
-							</view>
-							<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-								<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 8rpx;">
-									<view class="" style="position: relative">
-										<image src=""
-											style="background-color: rgba(119, 119, 119, 1);width: 124rpx;height: 124rpx;"
-											mode=""></image>
-										<view class="shopname">
-											纯牛奶
-										</view>
+						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+							<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 8rpx;">
+								<view class="" style="position: relative">
+									<image src=""
+										style="background-color: rgba(119, 119, 119, 1);width: 124rpx;height: 124rpx;"
+										mode=""></image>
+									<view class="shopname">
+										纯牛奶
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-					<view class="bigbox" v-for="(item,index) in 6" style="position: relative;" @click="todetail">
-						<image src="../../static/images/index/discount.png"
-							style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;" mode="">
-						</image>
-						<image src=""
-							style="width: 340rpx;height: 340rpx;background-color: rgba(119, 119, 119, 1) ;margin-left: -20rpx;margin-top: -18rpx;"
-							mode=""></image>
-						<view class="title">
-							INSTINCT天然百利狗粮 无谷泰迪去
-						</view>
-						<view class="">
-							<text class="money">
-								¥258.00
-							</text>
-							<text class="weight">
-								¥2kg
-							</text>
+			</view>
+			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
+				<view class="bigbox" v-for="(item,index) in 6" style="position: relative;" @click="todetail">
+					<image src="../../static/images/index/discount.png"
+						style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;z-index: 10;"
+						mode="">
+					</image>
+					<image src=""
+						style="width: 340rpx;height: 340rpx;background-color: rgba(119, 119, 119, 1) ;margin-left: -20rpx;margin-top: -18rpx;"
+						mode=""></image>
+					<view class="title">
+						INSTINCT天然百利狗粮 无谷泰迪去
+					</view>
+					<view class="">
+						<text class="money">
+							¥258.00
+						</text>
+						<text class="weight">
+							¥2kg
+						</text>
+					</view>
+					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
+						<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
 						</view>
-						<view class="u-flex"
-							style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
-							<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
-							</view>
-							<view class="taber"
-								style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">{{i18n.Trade}}
-							</view>
-							<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
+						<view class="taber" style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
+							{{i18n.Trade}}
 						</view>
+						<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
 					</view>
 				</view>
 			</view>
 		</view>
+
 		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
 			<view style="position: relative;">
 				<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png"
@@ -179,6 +181,7 @@
 				</view>
 			</view>
 		</u-popup>
+		<view class="" style="height: 160rpx;"></view>
 		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 </template>
@@ -210,7 +213,8 @@
 					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
 					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 				],
-				show: true
+				show: true,
+				timer: ''
 			}
 		},
 		computed: {
@@ -219,12 +223,25 @@
 			}
 		},
 		onLoad(options) {
-			this.list = [this.i18n.border, this.i18n.shop]
+			this.list = [this.i18n.border,this.i18n.shop]
+			// this.seater()
 			if (options.current) {
 				this.current = options.current
 			}
 		},
 		methods: {
+			//物流计算器
+			counter() {
+				uni.navigateTo({
+					url: '/pageA/counter'
+				})
+			},
+			//消息
+			tochat() {
+				uni.navigateTo({
+					url: '/pageA/chat/news'
+				})
+			},
 			//商品分类
 			shoptype() {
 				uni.navigateTo({
@@ -253,6 +270,17 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		background-color: rgba(0,0,0,0)
+	}
+	.index-navbar {
+		position: sticky;
+		top: 0;
+		left: 0;
+		width: 750rpx;
+		z-index: 100;
+	}
+
 	::v-deep .u-tabs {
 		width: 560rpx;
 	}
@@ -261,6 +289,13 @@
 		border-radius: 4rpx;
 		padding: 4rpx 8rpx;
 		margin-bottom: 10rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #D48700;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
 	}
 
 	.title {

+ 12 - 5
pages/shopping/shopping.vue

@@ -30,11 +30,11 @@
 						<text class="title">可心柔 V9系列婴儿保wadhbiuawd</text>
 						<view class="u-flex" style="margin-top: 12rpx;flex-wrap: wrap;column-gap: 12rpx;">
 							<view class="tabsa" v-for="(item,index) in 3">
-								坏单包赔
+								{{i18n.orderpaysforitself}}
 							</view>
 						</view>
 						<view class="num">
-							已售5000+件
+							{{i18n.Soldout}}5000+{{i18n.piece}}
 						</view>
 						<view class="" style="margin-top: 16rpx;position: relative;">
 							<image src="/static/shopping/btn.png"
@@ -54,6 +54,7 @@
 			</view>
 		</view>
 		<!-- <view class="" style="height: 80rpx;"></view> -->
+		<view class="" style="height: 160rpx;"></view>
 		<kj-tabbar :value1=2></kj-tabbar>
 	</view>
 </template>
@@ -87,7 +88,12 @@
 			click(item) {
 				console.log('item', item);
 			}
-		}
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 	}
 </script>
 
@@ -103,7 +109,7 @@
 
 		.item {
 			width: 340rpx;
-			height: 592rpx;
+			// height: 592rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 
@@ -124,7 +130,8 @@
 
 			.tabsa {
 				// width: 96rpx;
-				height: 32rpx;
+				// height: 32rpx;
+				margin-top: 10rpx;
 				border-radius: 4rpx;
 				border: 1rpx solid #ED0909;
 				font-family: PingFangSC, PingFang SC;

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -24,7 +24,8 @@
         "payorder",
         "confirm",
         "shoptype",
-        "shoplist"
+        "shoplist",
+        "rule/rule"
       ]
     },
     {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 268 - 241
unpackage/dist/dev/mp-weixin/common/vendor.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 84 - 28
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


+ 2 - 0
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.json

@@ -1,6 +1,8 @@
 {
   "component": true,
   "usingComponents": {
+    "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
     "u-tabbar": "/uview-ui/components/u-tabbar/u-tabbar",
     "u-tabbar-item": "/uview-ui/components/u-tabbar-item/u-tabbar-item"
   }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.wxml


+ 12 - 12
unpackage/dist/dev/mp-weixin/pageB/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
-/***/ 317:
+/***/ 325:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 318));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 326));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 318:
+/***/ 326:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 319);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 321);
+/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 327);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 329);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageB/index.vue"
 
 /***/ }),
 
-/***/ 319:
+/***/ 327:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageB/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 320);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 328);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 320:
+/***/ 328:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 321:
+/***/ 329:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 322);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 330);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 322:
+/***/ 330:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -154,5 +154,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[317,"common/runtime","common/vendor"]]]);
+},[[325,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

+ 12 - 12
unpackage/dist/dev/mp-weixin/pageC/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
-/***/ 433:
+/***/ 441:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 434));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 442));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 434:
+/***/ 442:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 435);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 437);
+/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 443);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 445);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageC/index.vue"
 
 /***/ }),
 
-/***/ 435:
+/***/ 443:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageC/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 436);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 444);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 436:
+/***/ 444:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 437:
+/***/ 445:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 438);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 446);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 438:
+/***/ 446:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -155,5 +155,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[433,"common/runtime","common/vendor"]]]);
+},[[441,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageC/index.js.map

+ 12 - 12
unpackage/dist/dev/mp-weixin/pageD/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
-/***/ 621:
+/***/ 629:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \**********************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 622));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 630));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 622:
+/***/ 630:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
   \*****************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 623);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 625);
+/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 631);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 633);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
@@ -60,7 +60,7 @@ component.options.__file = "pageD/index.vue"
 
 /***/ }),
 
-/***/ 623:
+/***/ 631:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pageD/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 624);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 632);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 624:
+/***/ 632:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -109,7 +109,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 625:
+/***/ 633:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -118,14 +118,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 626);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 634);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 626:
+/***/ 634:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -154,5 +154,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[621,"common/runtime","common/vendor"]]]);
+},[[629,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageD/index.js.map

+ 19 - 12
unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 773))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 783))
     },
     uSwipeAction: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 781))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 791))
     },
     uSwipeActionItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 787))
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 797))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 799))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 809))
     },
     uNumberBox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 807))
+      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 817))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 683))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 691))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
     },
   }
 } catch (e) {
@@ -281,12 +281,10 @@ exports.default = void 0;
 //
 //
 //
-//
-//
-//
 var _default = {
   data: function data() {
     return {
+      dele: true,
       success: true,
       shopitem: -1,
       checkboxValue1: [],
@@ -310,6 +308,11 @@ var _default = {
       tabarheight: ''
     };
   },
+  computed: {
+    i18n: function i18n() {
+      return this.$t('index');
+    }
+  },
   onLoad: function onLoad() {
     var systemInfo = wx.getSystemInfoSync();
     console.log(systemInfo);
@@ -329,10 +332,14 @@ var _default = {
     checkAll: function checkAll(e) {
       console.log('all', e);
     },
+    aaa: function aaa() {
+      console.log(this.$refs.tabbar1.getLabelHeight());
+    },
     checkboxChange: function checkboxChange(n) {
       console.log('change', n);
     }
-  }
+  },
+  mounted: function mounted() {}
 };
 exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml


+ 14 - 7
unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 683))
     },
     uBadge: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 750))
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 760))
     },
     uLineProgress: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 758))
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 768))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 708))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 716))
     },
     kjFlow: function () {
-      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 766))
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 776))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
     },
   }
 } catch (e) {
@@ -395,6 +395,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -455,6 +456,12 @@ var _default = {
         url: '/pageA/counter'
       });
     },
+    //消息
+    tochat: function tochat() {
+      uni.navigateTo({
+        url: '/pageA/chat/news'
+      });
+    },
     //物品信息
     goods: function goods() {
       uni.navigateTo({

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/express/express.wxml


+ 25 - 8
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
     },
     uSubsection: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 675))
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 683))
     },
     uIcon: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 683))
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 691))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 692))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 700))
     },
     uSwiper: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 700))
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 708))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 708))
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 716))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
     },
   }
 } catch (e) {
@@ -372,6 +372,9 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -394,7 +397,8 @@ var _default = {
       }],
       //轮播图
       banner: ['https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png'],
-      show: true
+      show: true,
+      timer: ''
     };
   },
   computed: {
@@ -404,11 +408,24 @@ var _default = {
   },
   onLoad: function onLoad(options) {
     this.list = [this.i18n.border, this.i18n.shop];
+    // this.seater()
     if (options.current) {
       this.current = options.current;
     }
   },
   methods: {
+    //物流计算器
+    counter: function counter() {
+      uni.navigateTo({
+        url: '/pageA/counter'
+      });
+    },
+    //消息
+    tochat: function tochat() {
+      uni.navigateTo({
+        url: '/pageA/chat/news'
+      });
+    },
     //商品分类
     shoptype: function shoptype() {
       uni.navigateTo({

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 18 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -24,6 +24,17 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+page.data-v-57280228 {
+  background-color: rgba(0, 0, 0, 0);
+}
+.index-navbar.data-v-57280228 {
+  position: -webkit-sticky;
+  position: sticky;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  z-index: 100;
+}
 .data-v-57280228 .u-tabs {
   width: 560rpx;
 }
@@ -31,6 +42,13 @@
   border-radius: 4rpx;
   padding: 4rpx 8rpx;
   margin-bottom: 10rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #D48700;
+  line-height: 28rpx;
+  text-align: left;
+  font-style: normal;
 }
 .title.data-v-57280228 {
   font-family: SFPro, SFPro;

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 773))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 783))
     },
     uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 799))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 809))
     },
   }
 } catch (e) {

+ 5 - 5
unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
     },
   }
 } catch (e) {
@@ -166,22 +166,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 722));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 732));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 729));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 739));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 736));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 746));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 743));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 753));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 9 - 3
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uNavbar: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 667))
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 675))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 692))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 700))
     },
     kjTabbar: function () {
-      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 716))
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 724))
     },
   }
 } catch (e) {
@@ -230,6 +230,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -258,6 +259,11 @@ var _default = {
     click: function click(item) {
       console.log('item', item);
     }
+  },
+  computed: {
+    i18n: function i18n() {
+      return this.$t('index');
+    }
   }
 };
 exports.default = _default;

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 14 - 14
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 13 - 13
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor