Kaynağa Gözat

语言替换

zhaogongxue 7 ay önce
ebeveyn
işleme
a555b4be82
77 değiştirilmiş dosya ile 1352 ekleme ve 1365 silme
  1. 143 6
      commont/messages.js
  2. 21 25
      components/kj-chat/kj-chat.vue
  3. 1 1
      pageA/changelange.vue
  4. 27 2
      pageA/chat/chat.vue
  5. 36 26
      pageA/chat/news.vue
  6. 1005 1134
      pageA/order.vue
  7. 1 1
      pageA/payorder.vue
  8. 24 90
      pageA/productdetails.vue
  9. 18 2
      pageA/service/service.vue
  10. BIN
      pageA/static/images/yuyin-left.png
  11. BIN
      pageA/static/images/yuyin-right.png
  12. 1 1
      pageA/subsidy.vue
  13. 2 2
      pageB/ParcelExpress.vue
  14. 1 1
      pageB/account.vue
  15. 1 1
      pageB/end.vue
  16. 4 4
      pageB/goods.vue
  17. 2 2
      pageB/orderinfo.vue
  18. 1 1
      pageB/parcel.vue
  19. 2 2
      pageB/recipientinfo.vue
  20. 1 1
      pageB/search.vue
  21. 27 24
      pages/cart/cart.vue
  22. 1 1
      pages/express/express.vue
  23. 1 1
      pages/index/index.vue
  24. 9 4
      pages/login/login.vue
  25. 2 2
      pages/shopping/shopping.vue
  26. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  27. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js
  28. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml
  29. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  30. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  31. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  32. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  33. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  34. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  35. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxss
  36. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  38. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/yuyin-left.png
  39. BIN
      unpackage/dist/build/mp-weixin/pageA/static/images/yuyin-right.png
  40. 0 0
      unpackage/dist/build/mp-weixin/pageB/expresstype.js
  41. 1 1
      unpackage/dist/build/mp-weixin/pageB/expresstype.wxml
  42. 1 1
      unpackage/dist/build/mp-weixin/pageB/expresstype.wxss
  43. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.js
  44. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.wxml
  45. 1 1
      unpackage/dist/build/mp-weixin/pageB/parcel.wxss
  46. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  47. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  48. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  49. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  50. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  51. 0 0
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.js
  52. 0 0
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxml
  53. 1 1
      unpackage/dist/build/mp-weixin/pages/shopping/shopping.wxss
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  61. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  62. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.js
  63. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.wxml
  64. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.js
  65. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml
  66. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml
  67. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.wxml
  68. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.js
  69. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.wxml
  70. BIN
      unpackage/dist/dev/mp-weixin/pageA/static/images/yuyin-left.png
  71. BIN
      unpackage/dist/dev/mp-weixin/pageA/static/images/yuyin-right.png
  72. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json
  73. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json
  74. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json
  75. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json
  76. 0 0
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml
  77. 3 13
      unpackage/dist/dev/mp-weixin/project.config.json

+ 143 - 6
commont/messages.js

@@ -99,8 +99,8 @@ export default {
 			goparceling: "去拼包",
 			sender: "新建寄件人",
 			recipient: "新建收件人",
-			informat: "点击填写寄件地址信息",
-			informate: "点击填写收件地址信息",
+			informat: "填写寄件地址信息",
+			informate: "填写收件地址信息",
 			addressbook: "地址簿",
 			select: "请选择物品信息",
 			//主页
@@ -311,7 +311,42 @@ export default {
 			Selected: '已选',
 			Buynow: '立即购买',
 			closeaccount:'确定要注销账号吗?',
-			other:'其他'
+			other:'其他',
+			store:'店铺',
+			
+
+			sales:'售前售后 安心无忧购物',
+			album:'保存到相册',
+			identify:'长按识别查看',
+			evaluate:'评价',
+			particulars:'详情',
+			savesuccessfully:'保存成功',
+			merchandiseNews:'商品信息',
+			shutdown:'取关成功',
+			Focus:'关注成功',
+			understock:'库存不足',
+			successfullyAdded:'添加成功',
+			Nofurtherdata:'已无更多数据',
+			Searchchat:'搜索聊天记录',
+			customerService:'官方客服',
+			picture:'图片',
+			voiceMessage:'语音消息',
+			return:'返回',
+			Marginpayment:'保证金支付',
+			itemtoSend:'请选择邮寄物品',
+			selectitemType:'请选择物品类型',
+			Weightnotlessthan:'重量不能小于',
+			cannotbelessthan:'数量不能小于',
+			Wechatlogin:'微信授权登录',
+			readandAgree:'我已阅读并同意',
+			useragreement:'用户协议',
+			Privacyagreement:'隐私协议',
+			offtheshelves:'商品下架',
+			top:'顶部',
+			Shiftfocus:'移入关注',
+			successfullydelete:'删除成功',
+			defaultTheme:'默认主题',
+			and:'和',
 		},
 	},
 	//英语
@@ -619,7 +654,41 @@ export default {
 			Selected: 'Selected',
 			Buynow: 'Buy Now',
 			closeaccount:'Are you sure you want to close your account?',
-			other:'other'
+			other:'other',
+			store:'store',
+			
+			sales: 'Pre-sales and after-sales, worry-free shopping',
+			album: 'Save to album',
+			identify: 'Long press to identify and view',
+			evaluate: 'Evaluate',
+			particulars: 'Details',
+			savesuccessfully: 'Save successfully',
+			merchandiseNews: 'Merchandise News',
+			shutdown: 'Unfollowed successfully',
+			Focus: 'Followed successfully',
+			understock: 'Out of stock',
+			successfullyAdded: 'Added successfully',
+			Nofurtherdata: 'No more data available',
+			Searchchat: 'Search chat history',
+			customerService: 'Customer Service',
+			picture: 'Picture',
+			voiceMessage: 'Voice message',
+			return: 'Return',
+			Marginpayment: 'Margin payment',
+			itemtoSend: 'Please select item to send',
+			selectitemType: 'Please select item type',
+			Weightnotlessthan: 'Weight must not be less than',
+			cannotbelessthan: 'Quantity must not be less than',
+			Wechatlogin: 'Login with WeChat',
+			readandAgree: 'I have read and agree to',
+			useragreement: 'User Agreement',
+			Privacyagreement: 'Privacy Agreement',
+			offtheshelves: 'Item is off the shelves',
+			top: 'Top',
+			Shiftfocus: 'Shift to focus',
+			successfullydelete: 'Deleted successfully',
+			defaultTheme: 'Default theme',
+			and:'and'
 		},
 	},
 	// 西班牙
@@ -909,7 +978,41 @@ export default {
 			Filling: 'Rellene el artículo de envío con precisión para que podamos recomendarle productos más adecuados',
 			Note: 'Nota: El peso y el volumen reales se determinan por el mensajero. El peso puede aumentar después del empaque, y si el artículo tiene un peso pequeño pero un volumen grande, se cobrará según el peso volumétrico',
 			closeaccount:'Seguro que desea cerrar su cuenta?',
-			other:'otros'
+			other:'otros',
+			store:'trozos',
+			
+			sales: 'Ventas: Compra tranquila con atención antes y después de la venta',
+			album: 'Guardar en álbum',
+			identify: 'Presiona y mantén para identificar y ver',
+			evaluate: 'Evaluar',
+			particulars: 'Particulares',
+			savesuccessfully: 'Guardado con éxito',
+			merchandiseNews: 'Noticias de productos',
+			shutdown: 'Desuscrito con éxito',
+			Focus: 'Siguiendo con éxito',
+			understock: 'Sin stock',
+			successfullyAdded: 'Agregado con éxito',
+			Nofurtherdata: 'No hay más datos',
+			Searchchat: 'Buscar historial de chat',
+			customerService: 'Servicio al cliente oficial',
+			picture: 'Imagen',
+			voiceMessage: 'Mensaje de voz',
+			return: 'Regresar',
+			Marginpayment: 'Pago de margen',
+			itemtoSend: 'Seleccione el artículo a enviar',
+			selectitemType: 'Seleccione el tipo de artículo',
+			Weightnotlessthan: 'El peso no debe ser menor que',
+			cannotbelessthan: 'La cantidad no debe ser menor que',
+			Wechatlogin: 'Iniciar sesión con WeChat',
+			readandAgree: 'He leído y acepto',
+			useragreement: 'Acuerdo del usuario',
+			Privacyagreement: 'Acuerdo de privacidad',
+			offtheshelves: 'Producto retirado de la estantería',
+			top: 'Parte superior',
+			Shiftfocus: 'Mover el enfoque',
+			successfullydelete: 'Eliminado con éxito',
+			defaultTheme: 'Tema predeterminado',
+			and:'y'
 		},
 	},
 	//意大利
@@ -1214,7 +1317,41 @@ export default {
 			Selected: 'Selezionato',
 			Buynow: 'Acquista ora',
 			closeaccount:'E’ sicuro di voler cancellare il numero di conto?',
-			other:'altri'
+			other:'altri',
+			store:'Del negozio',
+			
+			sales: 'Pre-vendita e post-vendita, acquisti senza preoccupazioni',
+			album: 'Salva nell album',
+			identify: 'Tieni premuto per riconoscere e visualizzare',
+			evaluate: 'Valuta',
+			particulars: 'Particolari',
+			savesuccessfully: 'Salvato con successo',
+			merchandiseNews: 'Notizie sui prodotti',
+			shutdown: 'Rimosso dai seguiti con successo',
+			Focus: 'Seguito con successo',
+			understock: 'Scarso magazzino',
+			successfullyAdded: 'Aggiunto con successo',
+			Nofurtherdata: 'Nessun altro dato disponibile',
+			Searchchat: 'Cerca nella cronologia della chat',
+			customerService: 'Servizio clienti ufficiale',
+			picture: 'Immagine',
+			voiceMessage: 'Messaggio vocale',
+			return: 'Ritorna',
+			Marginpayment: 'Pagamento della cauzione',
+			itemtoSend: 'Seleziona l oggetto da spedire',
+			selectitemType: 'Seleziona il tipo di oggetto',
+			Weightnotlessthan: 'Il peso non deve essere inferiore a',
+			cannotbelessthan: 'La quantità non deve essere inferiore a',
+			Wechatlogin: 'Accedi con WeChat',
+			readandAgree: 'Ho letto e accetto',
+			useragreement: 'Accordo utente',
+			Privacyagreement: 'Accordo sulla privacy',
+			offtheshelves: 'Prodotto non più in vendita',
+			top: 'In cima',
+			Shiftfocus: 'Sposta la attenzione',
+			successfullydelete: 'Eliminato con successo',
+			defaultTheme: 'Tema predefinito',
+			and:'e'
 		},
 	},
 };

+ 21 - 25
components/kj-chat/kj-chat.vue

@@ -66,17 +66,6 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="showtype == 2" class="changyong-box u-flex-col">
-				<scroll-view scroll-y="true" class="changyong-scroll u-flex-1">
-					<view class="changyong-text" v-for="(a,b) in changlist" :key="b" @click="select(a)">{{a.content}}
-					</view>
-				</scroll-view>
-				<view class="changyong-btn u-flex u-row-between">
-					<text class="text1" @click="toadd">新增</text>
-					<text class="text2"></text>
-					<text class="text1" @click="tolist">管理</text>
-				</view>
-			</view>
 			<scroll-view v-if="showtype == 3" scroll-y="true" class="emoji-scroll">
 				<view class="empji-box u-flex u-flex-wrap">
 					<text v-for="(a,b) in emoji" :key="b" @click="changeemoji(a)">{{a}}</text>
@@ -144,8 +133,8 @@
 				// clearInterval(init) // 清除定时器
 				recorderManager.onStop((res) => {
 					console.log('onstop', res);
-					this.tempFilePath = res.tempFilePath;
-					this.recordingTimer(this.time);
+					// this.tempFilePath = res.tempFilePath;
+					// this.recordingTimer(this.time);
 				})
 				const options = {
 					duration: this.duration, // 指定录音的时长,单位 ms
@@ -177,10 +166,10 @@
 						filePath: _this.tempFilePath,
 						name: 'file',
 						success: (res) => {
-							console.log('发送语音',res);
+							console.log('发送语音', res);
 							uni.hideLoading()
-							if (JSON.parse(res.data).code == 1) {
-								_this.sendluyin(JSON.parse(res.data).data.fullurl);
+							if (JSON.parse(res.data).code == 10000) {
+								_this.sendluyin(JSON.parse(res.data).data.filePath);
 							} else {
 								_this.$u.toast(JSON.parse(res.data).msg)
 							}
@@ -221,6 +210,10 @@
 						// 音频文件时长,单位为秒。
 						length: this.time,
 					},
+					ext: {
+						user_other: this.user_other,
+						user: this.user
+					},
 				};
 				let msg = new WebIM.message.create(option);
 				// 调用 `send` 方法发送该语音消息。
@@ -253,7 +246,7 @@
 					chatType: 'singleChat', // 设置为单聊
 					ext: {
 						user_other: this.user_other,
-						user:this.user
+						user: this.user
 					},
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
@@ -281,14 +274,15 @@
 						})
 						console.log('img', img);
 						uni.uploadFile({
-							url: 'https://hire.hdlkeji.com/api/common/upload',
+							url: 'https://cbec.hdlkeji.com/api/upload/images',
 							filePath: img.tempFilePaths[0],
 							name: 'file',
 							success: (res) => {
 								uni.hideLoading()
-								if (JSON.parse(res.data).code == 1) {
-									console.log('data', JSON.parse(res.data).data.fullurl);
-									_this.sendPrivateImg(JSON.parse(res.data).data.fullurl);
+								console.log(JSON.parse(res.data));
+								if (JSON.parse(res.data).code == 10000) {
+									console.log('data', JSON.parse(res.data).data.filePath);
+									_this.sendPrivateImg(JSON.parse(res.data).data.filePath);
 								} else {
 									_this.$u.toast(JSON.parse(res.data).msg)
 								}
@@ -311,14 +305,16 @@
 							mask: true,
 							title: "请稍后"
 						})
+						console.log('img', img);
 						uni.uploadFile({
-							url: 'https://hire.hdlkeji.com/api/common/upload',
+							url: 'https://cbec.hdlkeji.com/api/upload/images',
 							filePath: img.tempFilePaths[0],
 							name: 'file',
 							success: (res) => {
 								uni.hideLoading()
-								if (JSON.parse(res.data).code == 1) {
-									_this.sendPrivateImg(JSON.parse(res.data).data.fullurl);
+								console.log(JSON.parse(res.data));
+								if (JSON.parse(res.data).code == 10000) {
+									_this.sendPrivateImg(JSON.parse(res.data).data.filePath);
 								} else {
 									_this.$u.toast(JSON.parse(res.data).msg)
 								}
@@ -344,7 +340,7 @@
 						// shopname:this.user_other.merchant_name,
 						// image:this.user_other.image,
 						user_other: this.user_other,
-						user:this.user
+						user: this.user
 					},
 				};
 				// 创建一条图片消息。

+ 1 - 1
pageA/changelange.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar leftText="返回" :title="title" :safeAreaInsetTop="true" :placeholder='true'>
+		<u-navbar :leftText="i18n.return" :title="title" :safeAreaInsetTop="true" :placeholder='true'>
 			<view class="u-nav-slot" slot="left" @click="retur">
 				<!-- <u-icon name="arrow-left" size="19"></u-icon> -->
 				<!-- <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line> -->

+ 27 - 2
pageA/chat/chat.vue

@@ -6,7 +6,7 @@
 				<text class="title">{{user_other.merchant_name || user_other.easemob_nickname}}</text>
 			</view>
 			<view class="u-flex" slot="right" @click="goshop(user_other.id)">
-				<view v-if="user_other.merchant_name" class="dian">店铺</view>
+				<view v-if="user_other.merchant_name" class="dian">{{i18n.store}}</view>
 				<view class="" style="width: 200rpx;"></view>
 				<!-- <text class="title">{{user_other.merchant_name}}</text> -->
 				<!-- <text>{{user_other.company_name || ''}}·{{user_other.type || ''}}</text> -->
@@ -27,6 +27,16 @@
 						{{item.msg}}
 					</view>
 				</view>
+				<view class="" v-if="item.type=='img'" style="margin: 0 20rpx;">
+					<img :src="item.url" alt="" style="width: 200rpx;height: 200rpx;" />
+				</view>
+				<view style="max-width: 80%;" v-if="item.type == 'audio'">
+					<view class="chat-text hflex acenter jend" style="background: #D3E5FB;max-width: 550rpx;"
+						@click="playaudio(item.url)">
+						<image src="../static/images/yuyin-left.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
+						<text :style="'padding-left: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
+					</view>
+				</view>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
 					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item.ext.order.id)">
 					<view class="u-flex ">
@@ -47,6 +57,16 @@
 						{{item.msg}}
 					</view>
 				</view>
+				<view style="max-width: 80%;" v-if="item.type == 'audio'">
+					<view class="chat-text hflex acenter jend" style="background: #D3E5FB;max-width: 550rpx;"
+						@click="playaudio(item.url)">
+						<text :style="'padding-left: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
+						<image src="../static/images/yuyin-right.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
+					</view>
+				</view>
+				<view class="" v-if="item.type=='img'" style="margin: 0 20rpx;">
+					<img :src="item.url" alt="" style="width: 200rpx;height: 200rpx;" />
+				</view>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
 					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item.ext.order.id)">
 					<view class="u-flex ">
@@ -120,6 +140,11 @@
 		onShow() {
 			this.getdata()
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			//逛逛
 			goshop(id) {
@@ -232,7 +257,7 @@
 						console.log('res', res);
 						// 成功获取历史消息。
 						if (res.isLast) {
-							this.loadText = '已无更多数据';
+							this.loadText = this.i18n.Nofurtherdata;
 						}
 						this.list = res.messages.reverse()
 						console.log(this.list);

+ 36 - 26
pageA/chat/news.vue

@@ -3,7 +3,7 @@
 	<view class="back">
 		<view class="input u-flex">
 			<u-icon name="search" color="rgba(153, 153, 153, 1)" size="40"></u-icon>
-			<input type="text" placeholder="搜索聊天记录" style="width: 600rpx;margin-left: 16rpx;" />
+			<input type="text" :placeholder="i18n.Searchchat" style="width: 600rpx;margin-left: 16rpx;" />
 		</view>
 		<!-- 客服 -->
 		<view class="" v-for="(item,idx) in list" :key="idx">
@@ -13,7 +13,7 @@
 				<view class="u-row-between"
 					style="height: 88rpx;display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
 					<view class="u-flex u-row-between">
-						<view class="name">官方客服</view>
+						<view class="name">{{i18n.customerService}}</view>
 						<view class="time">
 							{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
 							{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
@@ -21,7 +21,8 @@
 					</view>
 					<view class="u-flex u-row-between">
 						<text v-if="item.lastMessage.msg" class="news">{{item.lastMessage.msg}}</text>
-						<text v-if="item.lastMessage.type == 'img'" class="news">图片</text>
+						<text v-if="item.lastMessage.type == 'img'" class="news">{{i18n.picture}}</text>
+						<text v-if="item.lastMessage.type == 'audio'" class="news">{{i18n.voiceMessage}}</text>
 						<u-badge :type="type" max="99" :value="item.unReadCount"></u-badge>
 					</view>
 				</view>
@@ -34,31 +35,35 @@
 						<view class="">
 							<view class=""> -->
 				<view class="u-flex " v-if="item.conversationId != '13523652365'">
-					<image v-if="item.lastMessage.ext.user.easemob_username == user_no" :src="item.lastMessage.ext.user_other.image || item.lastMessage.ext.user_other.avatar" style="width: 88rpx;height: 88rpx;" mode="">
-					<image v-else :src="item.lastMessage.ext.user.avatar" style="width: 88rpx;height: 88rpx;" mode="">
-					</image>
-					<view class="u-row-between"
-						style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
-						<view class="u-flex u-row-between">
-							<view class="name" v-if="item.lastMessage.ext.user.easemob_username == user_no">
-								{{ item.lastMessage.ext.user_other.merchant_name ||item.lastMessage.ext.user_other.nickname || item.lastMessage.ext.user_other.member.easemob_nickname}}
+					<image v-if="item.lastMessage.ext.user.easemob_username == user_no"
+						:src="item.lastMessage.ext.user_other.image || item.lastMessage.ext.user_other.avatar"
+						style="width: 88rpx;height: 88rpx;" mode="">
+						<image v-else :src="item.lastMessage.ext.user.avatar" style="width: 88rpx;height: 88rpx;"
+							mode="">
+						</image>
+						<view class="u-row-between"
+							style="display: flex;flex-direction: column;margin-left: 20rpx;width: 85%;">
+							<view class="u-flex u-row-between">
+								<view class="name" v-if="item.lastMessage.ext.user.easemob_username == user_no">
+									{{ item.lastMessage.ext.user_other.merchant_name ||item.lastMessage.ext.user_other.nickname || item.lastMessage.ext.user_other.member.easemob_nickname}}
+								</view>
+								<view class="name" v-else>
+									{{ item.lastMessage.ext.user.nickname}}
+								</view>
+								<!-- <view class="name">{{item.lastMessage.ext.user}}</view> -->
+								<view class="time">
+									{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
+									{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
+								</view>
 							</view>
-							<view class="name" v-else>
-								{{ item.lastMessage.ext.user.nickname}}
-							</view>
-							<!-- <view class="name">{{item.lastMessage.ext.user}}</view> -->
-							<view class="time">
-								{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
-								{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
+							<view class="u-flex u-row-between"
+								style="border-bottom: 2rpx solid #eae7e7;padding-bottom: 26rpx;margin-top: 10rpx;">
+								<text v-if="item.lastMessage.msg" class="news">{{item.lastMessage.msg}}</text>
+								<text v-if="item.lastMessage.type == 'img'" class="news">{{i18n.picture}}</text>
+								<text v-if="item.lastMessage.type == 'audio'" class="news">{{i18n.voiceMessage}}</text>
+								<u-badge :type="type" max="99" :value="item.unReadCount"></u-badge>
 							</view>
 						</view>
-						<view class="u-flex u-row-between"
-							style="border-bottom: 2rpx solid #eae7e7;padding-bottom: 26rpx;margin-top: 10rpx;">
-							<text v-if="item.lastMessage.msg" class="news">{{item.lastMessage.msg}}</text>
-							<text v-if="item.lastMessage.type == 'img'" class="news">图片</text>
-							<u-badge :type="type" max="99" :value="item.unReadCount"></u-badge>
-						</view>
-					</view>
 				</view>
 				<!-- 							</view>
 						</view>
@@ -122,6 +127,11 @@
 		onShow() {
 			this.getlist()
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			dele() {
 				let options = {
@@ -162,7 +172,7 @@
 							encodeURIComponent(JSON
 								.stringify(item.lastMessage.ext.user_other))
 					})
-				} else  {
+				} else {
 					uni.navigateTo({
 						url: '/pageA/chat/chat?user_other_no=' + item.conversationId + '&user_other=' +
 							encodeURIComponent(

+ 1005 - 1134
pageA/order.vue

@@ -1,95 +1,72 @@
 <template>
-  <view class="back">
-    <!-- 地址 -->
-    <view class="address" @click="toadd">
-      <view class="u-flex u-row-between">
-        <view class="add" v-if="addinfo">{{ addinfo.full_address }}</view>
-        <view class="" v-else>{{ i18n.shippingaddress }}</view>
-        <u-icon name="arrow-right" size="16"></u-icon>
-      </view>
-      <view class="info" v-if="addinfo">
-        <text>{{ addinfo.name }}</text>
-        <text style="margin-left: 20rpx">{{
+	<view class="back">
+		<!-- 地址 -->
+		<view class="address" @click="toadd">
+			<view class="u-flex u-row-between">
+				<view class="add" v-if="addinfo">{{ addinfo.full_address }}</view>
+				<view class="" v-else>{{ i18n.shippingaddress }}</view>
+				<u-icon name="arrow-right" size="16"></u-icon>
+			</view>
+			<view class="info" v-if="addinfo">
+				<text>{{ addinfo.name }}</text>
+				<text style="margin-left: 20rpx">{{
           replacePhoneToStar(addinfo.mobile)
         }}</text>
-      </view>
-    </view>
-    <!-- 商品 -->
-    <view class="shop">
-      <view class="" v-if="typea == 'shop'">
-        <view
-          class="u-flex"
-          style="margin-top: 32rpx"
-          v-for="(item, idx) in selelist"
-          :key="idx"
-        >
-          <image
-            :src="item.image"
-            style="width: 184rpx; height: 184rpx"
-            mode=""
-          ></image>
-          <view
-            class=" "
-            style="
+			</view>
+		</view>
+		<!-- 商品 -->
+		<view class="shop">
+			<view class="" v-if="typea == 'shop'">
+				<view class="u-flex" style="margin-top: 32rpx" v-for="(item, idx) in selelist" :key="idx">
+					<image :src="item.image" style="width: 184rpx; height: 184rpx" mode=""></image>
+					<view class=" " style="
               margin-left: 20rpx;
               flex-direction: column;
               justify-content: space-between;
               height: 184rpx;
               display: flex;
               flex: 1;
-            "
-          >
-            <view class="">
-              <text class="toptitle">{{ item.name_cn }}</text>
-              <view class="weight">{{ item.sku_item[0].item }} </view>
-            </view>
-            <view class="u-flex u-row-between">
-              <view class="">
-                <text class="money">¥</text>
-                <text class="money" style="font-size: 34rpx">{{
+            ">
+						<view class="">
+							<text class="toptitle">{{ item.name_cn }}</text>
+							<view class="weight">{{ item.sku_item[0].item }} </view>
+						</view>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money" style="font-size: 34rpx">{{
                   item.sku_item[0].discount_price
                 }}</text>
-              </view>
-              <view class=""> x {{ item.cart.goods_num }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="" v-else>
-        <view class="">
-          <image
-            :src="goodinfo.merchant.image"
-            style="width: 38rpx; height: 38rpx"
-            mode=""
-          ></image>
-          <text class="name">{{ goodinfo.merchant.merchant_name }}</text>
-        </view>
-        <view class="u-flex" style="margin-top: 32rpx">
-          <image
-            :src="sku_info.image"
-            style="width: 184rpx; height: 184rpx"
-            mode=""
-          ></image>
-          <view
-            class=" "
-            style="
+							</view>
+							<view class=""> x {{ item.cart.goods_num }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="" v-else>
+				<view class="">
+					<image :src="goodinfo.merchant.image" style="width: 38rpx; height: 38rpx" mode=""></image>
+					<text class="name">{{ goodinfo.merchant.merchant_name }}</text>
+				</view>
+				<view class="u-flex" style="margin-top: 32rpx">
+					<image :src="sku_info.image" style="width: 184rpx; height: 184rpx" mode=""></image>
+					<view class=" " style="
               margin-left: 20rpx;
               flex-direction: column;
               justify-content: space-between;
               height: 184rpx;
               display: flex;
               flex: 1;
-            "
-          >
-            <view class="">
-              <text class="toptitle">{{ goodinfo.name_cn }}</text>
-              <view class="weight">{{ sku_info.item }} </view>
-              <!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
-            </view>
-            <view class="u-flex u-row-between">
-              <view class="">
-                <text class="money">¥</text>
-                <text class="money" style="font-size: 34rpx">{{
+            ">
+						<view class="">
+							<text class="toptitle">{{ goodinfo.name_cn }}</text>
+							<view class="weight">{{ sku_info.item }} </view>
+							<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
+						</view>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money" style="font-size: 34rpx">{{
                   goodinfo.is_discount == 1
                     ? (Number(sku_info.price * 1000) * Number(value * 1000)) /
                       1000000
@@ -98,1170 +75,1064 @@
                         1000) /
                       1000000
                 }}</text>
-              </view>
-              <u-number-box v-model="value">
-                <view slot="minus" class="">
-                  <u-icon name="minus" size="12"></u-icon>
-                </view>
-                <input
-                  slot="input"
-                  v-model="value"
-                  style="width: 40px; text-align: center"
-                  class="input"
-                />
-                <view slot="plus" class="">
-                  <u-icon name="plus" size="12"></u-icon>
-                </view>
-              </u-number-box>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 物流 -->
-    <view class="logistics u-flex u-row-between">
-      <text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
-      <view class="u-flex" @click="show = true">
-        <text class="change">{{
+							</view>
+							<u-number-box v-model="value">
+								<view slot="minus" class="">
+									<u-icon name="minus" size="12"></u-icon>
+								</view>
+								<input slot="input" v-model="value" style="width: 40px; text-align: center"
+									class="input" />
+								<view slot="plus" class="">
+									<u-icon name="plus" size="12"></u-icon>
+								</view>
+							</u-number-box>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 物流 -->
+		<view class="logistics u-flex u-row-between">
+			<text style="font-weight: 600; width: 320rpx">{{ i18n.flow }}</text>
+			<view class="u-flex" @click="show = true">
+				<text class="change">{{
           containname1 ? type1 + " | " + containname1 : i18n.selection
         }}</text>
-        <u-icon name="arrow-right" size="16"></u-icon>
-      </view>
-    </view>
-    <!-- 推荐 -->
-    <view class="recommend">
-      <view class="top">
-        <image
-          src="static/images/recommend.png"
-          style="width: 124rpx; height: 30rpx"
-          mode=""
-        ></image>
-      </view>
-      <view class="bottom">
-        <scroll-view
-          scroll-x
-          class="u-flex"
-          style="column: gap 28rpx; display: flex"
-        >
-          <view class="u-flex" style="column-gap: 16rpx">
-            <view
-              class=""
-              v-for="(item, idx) in swiptlist"
-              :key="idx"
-              @click="todetail(item.id)"
-            >
-              <image
-                :src="item.image"
-                style="width: 156rpx; height: 156rpx"
-                mode=""
-              >
-              </image>
-              <view class="title" v-if="language == 'zh-CN'">
-                {{ item.name_cn }}
-              </view>
-              <view class="title" v-if="language == 'en-US'">
-                {{ item.name_en }}
-              </view>
-              <view class="title" v-if="language == 'es-ES'">
-                {{ item.name_es }}
-              </view>
-              <view class="title" v-if="language == 'it-IT'">
-                {{ item.name_ita }}
-              </view>
-              <view class="money" style="color: #f83224; font-size: 20rpx">
-                <text>¥</text>
-                <text style="font-size: 28rpx">{{
+				<u-icon name="arrow-right" size="16"></u-icon>
+			</view>
+		</view>
+		<!-- 推荐 -->
+		<view class="recommend">
+			<view class="top">
+				<image src="static/images/recommend.png" style="width: 124rpx; height: 30rpx" mode=""></image>
+			</view>
+			<view class="bottom">
+				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex">
+					<view class="u-flex" style="column-gap: 16rpx">
+						<view class="" v-for="(item, idx) in swiptlist" :key="idx" @click="todetail(item.id)">
+							<image :src="item.image" style="width: 156rpx; height: 156rpx" mode="">
+							</image>
+							<view class="title" v-if="language == 'zh-CN'">
+								{{ item.name_cn }}
+							</view>
+							<view class="title" v-if="language == 'en-US'">
+								{{ item.name_en }}
+							</view>
+							<view class="title" v-if="language == 'es-ES'">
+								{{ item.name_es }}
+							</view>
+							<view class="title" v-if="language == 'it-IT'">
+								{{ item.name_ita }}
+							</view>
+							<view class="money" style="color: #f83224; font-size: 20rpx">
+								<text>¥</text>
+								<text style="font-size: 28rpx">{{
                   item.is_discount == 0
                     ? item.discount_price.slice(0, -3)
                     : item.price.slice(0, -3)
                 }}</text>
-                <text>{{
+								<text>{{
                   item.is_discount == 0
                     ? item.discount_price.slice(-3)
                     : item.price.slice(-3)
                 }}</text>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </view>
-    <!-- 商品相关 -->
-    <view class="abount" style="margin-top: 20rpx">
-      <view class="u-flex u-row-between" style="margin-bottom: 40rpx">
-        <view class="name">{{ i18n.Commodityamount }}</view>
-        <view class="" v-if="typea == 'shop'">{{ goodsPrice }}</view>
-        <view class="money" v-else>
-          ¥{{
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- 商品相关 -->
+		<view class="abount" style="margin-top: 20rpx">
+			<view class="u-flex u-row-between" style="margin-bottom: 40rpx">
+				<view class="name">{{ i18n.Commodityamount }}</view>
+				<view class="" v-if="typea == 'shop'">{{ goodsPrice }}</view>
+				<view class="money" v-else>
+					¥{{
             goodinfo.is_discount == 1
               ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
               : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
                 10000
           }}
-        </view>
-      </view>
-      <view class="u-flex u-row-between" v-show="containname1">
-        <view class="name">{{ i18n.Grosscommodityweight }}</view>
-        <!-- 				<view class="money" v-if="typea=='shop'">{{
+				</view>
+			</view>
+			<view class="u-flex u-row-between" v-show="containname1">
+				<view class="name">{{ i18n.Grosscommodityweight }}</view>
+				<!-- 				<view class="money" v-if="typea=='shop'">{{
 					goodsWeight
 				}}kg</view> -->
-        <!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
-        <view class="money">{{ weight_total }}</view>
-      </view>
-      <view class="back u-flex" v-if="containname1">
-        <image
-          src="static/images/warning.png"
-          style="width: 32rpx; height: 32rpx"
-          mode=""
-        ></image>
-        <text style="margin-left: 12rpx; font-size: 24rpx"
-          >{{ i18n.buy }}{{ max_weight }}kg{{ i18n.price }}¥{{ unit_fee }},{{
+				<!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
+				<view class="money">{{ weight_total }}</view>
+			</view>
+			<view class="back u-flex" v-if="containname1">
+				<image src="static/images/warning.png" style="width: 32rpx; height: 32rpx" mode=""></image>
+				<text
+					style="margin-left: 12rpx; font-size: 24rpx">{{ i18n.buy }}{{ recommend_weight }}kg{{ i18n.price }}¥{{ unit_fee }},{{
             i18n.morefavorable
-          }}</text
-        >
-      </view>
-      <view
-        class="u-flex u-row-between"
-        style="margin-bottom: 40rpx; margin-top: 20rpx"
-      >
-        <view class="name">{{ i18n.Costperkilogram }}</view>
-        <view class="money">{{
+          }}</text>
+			</view>
+			<view class="u-flex u-row-between" style="margin-bottom: 40rpx; margin-top: 20rpx">
+				<view class="name">{{ i18n.Costperkilogram }}</view>
+				<view class="money">{{
           containname1 ? unit_price : i18n.shippingmethod
         }}</view>
-      </view>
-      <view class="u-flex u-row-between">
-        <view class="name">{{ i18n.freight }}</view>
-        <view class="money">{{
+			</view>
+			<view class="u-flex u-row-between">
+				<view class="name">{{ i18n.freight }}</view>
+				<view class="money">{{
           containname1 ? sum : i18n.shippingmethod
         }}</view>
-      </view>
-      <view class="zong u-flex u-row-right">
-        <view class="">
-          <text class="small">{{ i18n.subtotal }}</text>
-          <text class="mon">¥</text>
-          <text class="mon" v-if="typea == 'shop'">{{ goodsPrice }}</text>
-          <text class="mon" v-else style="font-size: 40rpx">{{
+			</view>
+			<view class="zong u-flex u-row-right">
+				<view class="">
+					<text class="small">{{ i18n.subtotal }}</text>
+					<text class="mon">¥</text>
+					<text class="mon" v-if="typea == 'shop'">{{ goodsPrice }}</text>
+					<text class="mon" v-else style="font-size: 40rpx">{{
             goodinfo.is_discount == 1
               ? (Number(sku_info.price * 100) * Number(value * 100)) / 10000
               : (Number(sku_info.discount_price * 100) * Number(value * 100)) /
                 10000
           }}</text>
-        </view>
-      </view>
-    </view>
-    <view class="" style="height: 166rpx"></view>
-    <view class="btn u-flex u-row-right">
-      <view class="u-flex">
-        <!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
+				</view>
+			</view>
+		</view>
+		<view class="" style="height: 166rpx"></view>
+		<view class="btn u-flex u-row-right">
+			<view class="u-flex">
+				<!-- 				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
 				<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text> -->
-        <text class="kg" v-show="containname1"
-          >{{ i18n.Atotalof }}{{ weight_total }}kg,</text
-        >
-        <text>{{ i18n.total }}:</text>
-        <text class="money" style="font-size: 28rpx">¥</text>
-        <text style="font-weight: bold" class="money" v-if="typea == 'shop'">{{
+				<text class="kg" v-show="containname1">{{ i18n.Atotalof }}{{ weight_total }}kg,</text>
+				<text>{{ i18n.total }}:</text>
+				<text class="money" style="font-size: 28rpx">¥</text>
+				<text style="font-weight: bold" class="money" v-if="typea == 'shop'">{{
           Number(sum * 10000 + Number(goodsPrice) * 10000) / 10000
         }}</text>
-        <view class="" v-else>
-          <text
-            class="money"
-            v-if="goodinfo.is_discount == 1"
-            style="font-weight: bold"
-            >{{
+				<view class="" v-else>
+					<text class="money" v-if="goodinfo.is_discount == 1" style="font-weight: bold">{{
               Number(
                 sum * 10000 + Number(sku_info.price) * Number(value) * 10000
               ) / 10000
-            }}</text
-          >
-          <text
-            class="money"
-            v-if="goodinfo.is_discount == 0"
-            style="font-weight: bold"
-            >{{
+            }}</text>
+					<text class="money" v-if="goodinfo.is_discount == 0" style="font-weight: bold">{{
               Number(
                 sum * 10000 +
                   Number(sku_info.discount_price) * Number(value) * 10000
               ) / 10000
-            }}</text
-          >
-        </view>
-      </view>
-      <view class="order" @click="topay">
-        {{ i18n.Submitorder }}
-      </view>
-    </view>
-    <!-- 跨境物流 -->
-    <u-popup
-      :show="show"
-      @close="close"
-      mode="bottom"
-      closeIconPos="top-right"
-      round="28"
-    >
-      <view style="padding: 40rpx 28rpx; box-sizing: border-box">
-        <view class="u-flex u-row-between">
-          <view class="" style="width: 28px; height: 28px"></view>
-          <view class="poptitle">
-            {{ i18n.flow }}
-          </view>
-          <u-icon
-            name="close"
-            @click="close"
-            color="background: #333333;"
-            size="28"
-          ></u-icon>
-        </view>
-        <view
-          class="u-flex"
-          style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx"
-        >
-          <view
-            :class="index == idx ? 'active' : 'unactive'"
-            v-for="(item, idx) in containerList"
-            @click="change(item, idx)"
-            style="
+            }}</text>
+				</view>
+			</view>
+			<view class="order" @click="topay">
+				{{ i18n.Submitorder }}
+			</view>
+		</view>
+		<!-- 跨境物流 -->
+		<u-popup :show="show" @close="close" mode="bottom" closeIconPos="top-right" round="28">
+			<view style="padding: 40rpx 28rpx; box-sizing: border-box">
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px; height: 28px"></view>
+					<view class="poptitle">
+						{{ i18n.flow }}
+					</view>
+					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
+				</view>
+				<view class="u-flex" style="margin-top: 60rpx; flex-wrap: wrap; column-gap: 16rpx">
+					<view :class="index == idx ? 'active' : 'unactive'" v-for="(item, idx) in containerList"
+						@click="change(item, idx)" style="
               display: flex;
               flex-direction: column;
               align-items: center;
               justify-content: center;
               margin-bottom: 28rpx;
               position: relative;
-            "
-          >
-            <image
-              v-if="index == idx"
-              src="static/images/change.png"
-              style="
+            ">
+						<image v-if="index == idx" src="static/images/change.png" style="
                 width: 36rpx;
                 height: 32rpx;
                 position: absolute;
                 top: 0;
                 right: 0;
-              "
-              mode=""
-            ></image>
-            <view class="logname" v-if="language == 'zh-CN'">{{
+              " mode=""></image>
+						<view class="logname" v-if="language == 'zh-CN'">{{
               item.name_cn
             }}</view>
-            <view class="logname" v-if="language == 'en-US'">{{
+						<view class="logname" v-if="language == 'en-US'">{{
               item.name_en
             }}</view>
-            <view class="logname" v-if="language == 'es-ES'">{{
+						<view class="logname" v-if="language == 'es-ES'">{{
               item.name_es
             }}</view>
-            <view class="logname" v-if="language == 'it-IT'">{{
+						<view class="logname" v-if="language == 'it-IT'">{{
               item.name_ita
             }}</view>
-            <!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
-            <view class="wei" style="font-size: 32rpx; font-weight: 600"
-              >¥{{ item.unit_price }}/kg</view
-            >
-          </view>
-        </view>
-        <view class="nextto" @click="next">{{ i18n.next }}</view>
-      </view>
-    </u-popup>
-    <!-- 跨境物流下一步 -->
-    <u-popup
-      :safeAreaInsetTop="true"
-      :show="show1"
-      @close="close"
-      mode="bottom"
-      closeIconPos="top-right"
-      round="28"
-      bgColor="#F4F4F4"
-    >
-      <view
-        style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative"
-      >
-        <view class="u-flex u-row-between">
-          <view class="" style="width: 28px; height: 28px"></view>
-          <view class="poptitle">
-            {{ i18n.flow }}
-          </view>
-          <u-icon
-            name="close"
-            @click="close"
-            color="background: #333333;"
-            size="28"
-          ></u-icon>
-        </view>
-        <scroll-view :scroll-y="true" style="500rpx">
-          <view
-            class="transport"
-            style="margin-top: 32rpx"
-            @click="activea(item, idx)"
-            v-for="(item, idx) in containlist"
-            v-if="item.sum != 0"
-          >
-            <view class="u-flex u-row-between">
-              <text class="yundate"
-                >{{ i18n.Shipmentdate }} {{ item.end_date }}</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"
-                mode=""
-              ></image>
-            </view>
-            <view class="u-flex u-row-between" style="margin-top: 28rpx">
-              <view class="chest">
-                <text v-if="language == 'zh-CN'">{{ item.name_cn }}</text>
-                <text v-if="language == 'en-US'">{{ item.name_en }}</text>
-                <text v-if="language == 'es-ES'">{{ item.name_es }}</text>
-                <text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
-                <text style="margin: 0 16rpx">|</text>
-                <text
-                  >{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
-                  }}{{ i18n.Workingday }}</text
-                >
-              </view>
-              <view class="mone">
-                <text>¥</text>
-                <text style="font-size: 48rpx; font-weight: 600">{{
+						<!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
+						<view class="wei" style="font-size: 32rpx; font-weight: 600">¥{{ item.unit_price }}/kg</view>
+					</view>
+				</view>
+				<view class="nextto" @click="next">{{ i18n.next }}</view>
+			</view>
+		</u-popup>
+		<!-- 跨境物流下一步 -->
+		<u-popup :safeAreaInsetTop="true" :show="show1" @close="close" mode="bottom" closeIconPos="top-right" round="28"
+			bgColor="#F4F4F4">
+			<view style="padding: 40rpx 28rpx; box-sizing: border-box; position: relative">
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px; height: 28px"></view>
+					<view class="poptitle">
+						{{ i18n.flow }}
+					</view>
+					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
+				</view>
+				<scroll-view :scroll-y="true" style="500rpx">
+					<view class="transport" style="margin-top: 32rpx" @click="activea(item, idx)"
+						v-for="(item, idx) in containlist" v-if="item.sum != 0">
+						<view class="u-flex u-row-between">
+							<text class="yundate">{{ i18n.Shipmentdate }} {{ item.end_date }}</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"
+								mode=""></image>
+						</view>
+						<view class="u-flex u-row-between" style="margin-top: 28rpx">
+							<view class="chest">
+								<text v-if="language == 'zh-CN'">{{ item.name_cn }}</text>
+								<text v-if="language == 'en-US'">{{ item.name_en }}</text>
+								<text v-if="language == 'es-ES'">{{ item.name_es }}</text>
+								<text v-if="language == 'it-IT'">{{ item.name_ita }}</text>
+								<text style="margin: 0 16rpx">|</text>
+								<text>{{ i18n.Estimatedtimeofarrival }}{{ item.transport_days
+                  }}{{ i18n.Workingday }}</text>
+							</view>
+							<view class="mone">
+								<text>¥</text>
+								<text style="font-size: 48rpx; font-weight: 600">{{
                   item.sum
                 }}</text>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-        <view class="" style="height: 166rpx"></view>
-        <view class="enbottom u-flex u-row-between">
-          <view class="cancel" @click="close">{{ i18n.Cancel }}</view>
-          <view class="confirm" @click="confirm">{{ i18n.enter }}</view>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="" style="height: 166rpx"></view>
+				<view class="enbottom u-flex u-row-between">
+					<view class="cancel" @click="close">{{ i18n.Cancel }}</view>
+					<view class="confirm" @click="confirm">{{ i18n.enter }}</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      value: 1,
-      show: false,
-      index: "",
-      show1: false,
-      datechan: "",
-      sku_info: {},
-      goodinfo: {},
-      swiptlist: [], //推荐列表
-      language: "zh-CN",
-      containerList: [], //列表
-      province_id: "",
-      transport_type_id: "",
-      containlist: [],
-      containid: "", //货柜id
-      containname: "", //货柜名称
-      type: "", //货运方式名称
-      containname1: "",
-      type1: "",
-      sum: "",
-      unit_price: "",
-      recommend_weight: "",
-      sum1: "",
-      unit_price1: "",
-      recommend_weight1: "",
-      max_weight: "",
-      min_weight: "",
-      unit_fee: "",
-      addinfo: "",
-      huoid: "",
-      selelist: [],
-      typea: "",
-      goodsPrice: "",
-      goodsWeight: "",
-      stringcheck: "",
-      cartid: "",
-      weight_total: "",
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad(options) {
-    // url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
-    if (options.typea) {
-      console.log(22222);
-      this.typea = options.typea;
-      this.selelist = JSON.parse(decodeURIComponent(options.selelist));
-      this.goodsPrice = options.goodsPrice;
-      this.goodsWeight = options.goodsWeight;
-      this.stringcheck = options.stringcheck;
-      this.cartid = options.cartid;
-    } else if (options) {
-      this.value = options.value;
-      this.sku_info = JSON.parse(decodeURIComponent(options.sku));
-      this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
-      if (options.share_merchant_id) {
-        this.share_merchant_id = options.share_merchant_id;
-      }
-    }
-  },
-  onShow() {
-    if (uni.getStorageSync("language") != "") {
-      this.language = uni.getStorageSync("language");
-    }
-    this.recommend();
-    // this.container()
-  },
-  methods: {
-    todetail(id) {
-      uni.navigateTo({
-        url: "/pageA/productdetails?id=" + id,
-      });
-    },
-    //正则匹配手机号
-    replacePhoneToStar: function (phone) {
-      if (phone) {
-        return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
-      }
-    },
-    //推荐重量
-    recommendweight() {
-      uni.$u.http
-        .get("/api/express-order/recommend-container", {
-          params: {
-            container_id: this.containid,
-            type: this.goodinfo.cate == 0 ? "normal" : "special",
-          },
-        })
-        .then((res) => {
-          console.log(res);
-          this.max_weight = res.max_weight;
-          this.min_weight = res.min_weight;
-          this.unit_fee = res.unit_fee;
-        })
-        .catch(() => {});
-    },
-    //货运类型列表
-    transport() {
-      uni.$u.http
-        .get("/api/transport-type", {
-          params: {
-            province_id: this.province_id,
-          },
-        })
-        .then((res) => {
-          this.containerList = res;
-          this.transport_type_id = res[0].id;
-          if (this.language == "zh-CN") {
-            this.type = res[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.type = res[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.type = res[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.type = res[0].name_ita;
-          }
-        })
-        .catch(() => {});
-    },
-    //跳转到填写地址
-    toadd() {
-      var that = this;
-      uni.navigateTo({
-        url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
-        events: {
-          getadd(res) {
-            that.addinfo = res;
-            that.province_id = res.province_id;
-            that.transport();
-          },
-        },
-      });
-    },
-    //货柜列表
-    container() {
-      this.containlist = [];
-      uni.$u.http
-        .get("/api/container-base", {
-          params: {
-            is_page: 0,
-            province_id: this.province_id,
-            transport_type_id: this.transport_type_id,
-            weight:
-              this.typea == "shop"
-                ? ""
-                : Number(this.sku_info.weight) * this.value,
-            type:
-              this.typea == "shop"
-                ? ""
-                : this.goodinfo.cate == 0
-                ? "normal"
-                : "special",
-            length:
-              this.typea == "shop"
-                ? ""
-                : Number(this.sku_info.length) * this.value, //		是	String	长
-            width: this.sku_info.width, //		是	String	宽
-            height: this.sku_info.height, //		是	String	高
-            cart_id: this.cartid,
-            // cart_id: '147,148'
-          },
-        })
-        .then((res) => {
-          res.forEach((item) => {
-            if (item.sum != 0) {
-              this.containlist.push(item);
-            }
-            console.log(this.containlist);
-          });
-          if (this.cartid.length == 0 && this.typea == "shop") {
-            console.log("his.cartid.length", this.cartid.length);
-            this.sum = 0;
-          }
-          // this.sum = this.containlist[0].sum
-          // this.unit_price = this.containlist[0].unit_price
-          if (this.goodinfo.is_shipping == 0) {
-            this.sum = 0;
-          } else {
-            this.sum = this.containlist[0].sum;
-          }
-          if (this.goodinfo.is_shipping == 0) {
-            this.unit_price = 0;
-          } else {
-            this.unit_price = this.containlist[0].unit_price;
-          }
-          this.recommend_weight = this.containlist[0].recommend_weight;
-          this.weight_total = this.containlist[0].weight_total;
-          this.containid = this.containlist[0].id;
-          if (this.language == "zh-CN") {
-            this.containname = this.containlist[0].name_cn;
-          }
-          if (this.language == "en-US") {
-            this.containname = this.containlist[0].name_en;
-          }
-          if (this.language == "es-ES") {
-            this.containname = this.containlist[0].name_es;
-          }
-          if (this.language == "it-IT") {
-            this.containname = this.containlist[0].name_ita;
-          }
-        })
-        .catch(() => {});
-    },
-    //运费满减
-    config() {
-      var that = this;
-      uni.$u.http
-        .get("/api/config", {
-          params: {
-            module: "free_shipping",
-          },
-        })
-        .then((res) => {
-          if (
-            Number(that.goodsPrice) > res.free_shipping &&
-            that.typea == "shop"
-          ) {
-            console.log("goodsPrice", that.goodsPrice);
-            console.log("res.free_shipping", res.free_shipping);
-            that.sum = 0;
-            that.unit_price = 0;
-          }
-          let goodsum = "";
-          if (that.goodinfo.is_discount == 1) {
-            goodsum =
-              (Number(that.sku_info.price * 100) * Number(that.value * 100)) /
-              10000;
-            console.log("that.sum", that.sum);
-            console.log("that.goodsum", goodsum);
-            if (goodsum > res.free_shipping) {
-              that.sum = 0;
-              that.unit_price = 0;
-            }
-          } else {
-            goodsum =
-              (Number(that.sku_info.discount_price * 100) *
-                Number(that.value * 100)) /
-              10000;
-            if (goodsum > res.free_shipping) {
-              that.sum = 0;
-              that.unit_price = 0;
-            }
-          }
-        })
-        .catch(() => {});
-    },
-    //商品推荐
-    recommend() {
-      uni.$u.http
-        .post("/api/goods/recommend", {
-          keyword: "",
-        })
-        .then((res) => {
-          this.swiptlist = res;
-        })
-        .catch(() => {});
-    },
-    change(item, index) {
-      this.transport_type_id = item.id;
-      this.index = index;
-      if (this.language == "zh-CN") {
-        this.type = item.name_cn;
-      }
-      if (this.language == "en-US") {
-        this.type = item.name_en;
-      }
-      if (this.language == "es-ES") {
-        this.type = item.name_es;
-      }
-      if (this.language == "it-IT") {
-        this.type = item.name_ita;
-      }
-    },
-    next() {
-      this.show = false;
-      this.show1 = true;
-      this.type1 = this.type;
-      this.container();
-    },
-    activea(item, idx) {
-      this.datechan = idx;
-      this.sum = item.sum;
-      this.unit_price = item.unit_price;
-      this.recommend_weight = item.recommend_weight;
-      this.containid = item.id;
-      this.weight_total = item.weight_total;
-      if (this.language == "zh-CN") {
-        this.containname = item.name_cn;
-      }
-      if (this.language == "en-US") {
-        this.containname = item.name_en;
-      }
-      if (this.language == "es-ES") {
-        this.containname = item.name_es;
-      }
-      if (this.language == "it-IT") {
-        this.containname = item.name_ita;
-      }
-    },
-    //确定
-    confirm() {
-      this.show1 = false;
-      this.containname1 = this.containname;
-      this.recommendweight();
-      this.config();
-    },
-    // 取消
-    close() {
-      this.show = false;
-      this.show1 = false;
-    },
-    //提交订单
-    topay() {
-      uni.$u.http
-        .post("/api/order", {
-          address_id: this.addinfo.id, //3	是	String	地址ID
-          goods_id: this.goodinfo.id, //65	是	String	商品id
-          goods_num: this.value, //2	是	String	商品数量
-          sku_item_id: this.sku_info.id, //60	是	String	规格id
-          cart_ids: this.stringcheck, //8,9	是	String	购物车id
-          remark: "", //备注	是	String	备注
-          merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
-          container_id: this.containid, //1	是	String	货柜id
-          share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
-          belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
-        })
-        .then((res) => {
-          console.log("share_merchant_id", this.share_merchant_id);
-          console.log(res);
-          uni.navigateTo({
-            // url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
-            url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
-          });
-        })
-        .catch(() => {});
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				value: 1,
+				show: false,
+				index: "",
+				show1: false,
+				datechan: "",
+				sku_info: {},
+				goodinfo: {},
+				swiptlist: [], //推荐列表
+				language: "zh-CN",
+				containerList: [], //列表
+				province_id: "",
+				transport_type_id: "",
+				containlist: [],
+				containid: "", //货柜id
+				containname: "", //货柜名称
+				type: "", //货运方式名称
+				containname1: "",
+				type1: "",
+				sum: "",
+				unit_price: "",
+				recommend_weight: "",
+				sum1: "",
+				unit_price1: "",
+				recommend_weight1: "",
+				max_weight: "",
+				min_weight: "",
+				unit_fee: "",
+				addinfo: "",
+				huoid: "",
+				selelist: [],
+				typea: "",
+				goodsPrice: "",
+				goodsWeight: "",
+				stringcheck: "",
+				cartid: "",
+				weight_total: "",
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad(options) {
+			// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
+			if (options.typea) {
+				console.log(22222);
+				this.typea = options.typea;
+				this.selelist = JSON.parse(decodeURIComponent(options.selelist));
+				this.goodsPrice = options.goodsPrice;
+				this.goodsWeight = options.goodsWeight;
+				this.stringcheck = options.stringcheck;
+				this.cartid = options.cartid;
+			} else if (options) {
+				this.value = options.value;
+				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
+				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
+				if (options.share_merchant_id) {
+					this.share_merchant_id = options.share_merchant_id;
+				}
+			}
+		},
+		onShow() {
+			if (uni.getStorageSync("language") != "") {
+				this.language = uni.getStorageSync("language");
+			}
+			this.recommend();
+			// this.container()
+		},
+		methods: {
+			todetail(id) {
+				uni.navigateTo({
+					url: "/pageA/productdetails?id=" + id,
+				});
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
+				}
+			},
+			//推荐重量
+			recommendweight() {
+				uni.$u.http
+					.get("/api/express-order/recommend-container", {
+						params: {
+							container_id: this.containid,
+							type: this.goodinfo.cate == 0 ? "normal" : "special",
+						},
+					})
+					.then((res) => {
+						console.log(res);
+						this.max_weight = res.max_weight;
+						this.min_weight = res.min_weight;
+						this.unit_fee = res.unit_fee;
+					})
+					.catch(() => {});
+			},
+			//货运类型列表
+			transport() {
+				uni.$u.http
+					.get("/api/transport-type", {
+						params: {
+							province_id: this.province_id,
+						},
+					})
+					.then((res) => {
+						this.containerList = res;
+						this.transport_type_id = res[0].id;
+						if (this.language == "zh-CN") {
+							this.type = res[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.type = res[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.type = res[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.type = res[0].name_ita;
+						}
+					})
+					.catch(() => {});
+			},
+			//跳转到填写地址
+			toadd() {
+				var that = this;
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?tabs=" + Number(0),
+					events: {
+						getadd(res) {
+							that.addinfo = res;
+							that.province_id = res.province_id;
+							that.transport();
+						},
+					},
+				});
+			},
+			//货柜列表
+			container() {
+				this.containlist = [];
+				uni.$u.http
+					.get("/api/container-base", {
+						params: {
+							is_page: 0,
+							province_id: this.province_id,
+							transport_type_id: this.transport_type_id,
+							weight: this.typea == "shop" ?
+								"" : Number(this.sku_info.weight) * this.value,
+							type: this.typea == "shop" ?
+								"" : this.goodinfo.cate == 0 ?
+								"normal" : "special",
+							length: this.typea == "shop" ?
+								"" : Number(this.sku_info.length) * this.value, //		是	String	长
+							width: this.sku_info.width, //		是	String	宽
+							height: this.sku_info.height, //		是	String	高
+							cart_id: this.cartid,
+							// cart_id: '147,148'
+						},
+					})
+					.then((res) => {
+						res.forEach((item) => {
+							if (item.sum != 0) {
+								this.containlist.push(item);
+							}
+							console.log(this.containlist);
+						});
+						if (this.cartid.length == 0 && this.typea == "shop") {
+							console.log("his.cartid.length", this.cartid.length);
+							this.sum = 0;
+						}
+						// this.sum = this.containlist[0].sum
+						// this.unit_price = this.containlist[0].unit_price
+						if (this.goodinfo.is_shipping == 0) {
+							this.sum = 0;
+						} else {
+							this.sum = this.containlist[0].sum;
+						}
+						if (this.goodinfo.is_shipping == 0) {
+							this.unit_price = 0;
+						} else {
+							this.unit_price = this.containlist[0].unit_price;
+						}
+						this.recommend_weight = this.containlist[0].recommend_weight;
+						this.weight_total = this.containlist[0].weight_total;
+						this.containid = this.containlist[0].id;
+						if (this.language == "zh-CN") {
+							this.containname = this.containlist[0].name_cn;
+						}
+						if (this.language == "en-US") {
+							this.containname = this.containlist[0].name_en;
+						}
+						if (this.language == "es-ES") {
+							this.containname = this.containlist[0].name_es;
+						}
+						if (this.language == "it-IT") {
+							this.containname = this.containlist[0].name_ita;
+						}
+					})
+					.catch(() => {});
+			},
+			//运费满减
+			config() {
+				var that = this;
+				uni.$u.http
+					.get("/api/config", {
+						params: {
+							module: "free_shipping",
+						},
+					})
+					.then((res) => {
+						if (
+							Number(that.goodsPrice) > res.free_shipping &&
+							that.typea == "shop"
+						) {
+							console.log("goodsPrice", that.goodsPrice);
+							console.log("res.free_shipping", res.free_shipping);
+							that.sum = 0;
+							that.unit_price = 0;
+						}
+						let goodsum = "";
+						if (that.goodinfo.is_discount == 1) {
+							goodsum =
+								(Number(that.sku_info.price * 100) * Number(that.value * 100)) /
+								10000;
+							console.log("that.sum", that.sum);
+							console.log("that.goodsum", goodsum);
+							if (goodsum > res.free_shipping) {
+								that.sum = 0;
+								that.unit_price = 0;
+							}
+						} else {
+							goodsum =
+								(Number(that.sku_info.discount_price * 100) *
+									Number(that.value * 100)) /
+								10000;
+							if (goodsum > res.free_shipping) {
+								that.sum = 0;
+								that.unit_price = 0;
+							}
+						}
+					})
+					.catch(() => {});
+			},
+			//商品推荐
+			recommend() {
+				uni.$u.http
+					.post("/api/goods/recommend", {
+						keyword: "",
+					})
+					.then((res) => {
+						this.swiptlist = res;
+					})
+					.catch(() => {});
+			},
+			change(item, index) {
+				this.transport_type_id = item.id;
+				this.index = index;
+				if (this.language == "zh-CN") {
+					this.type = item.name_cn;
+				}
+				if (this.language == "en-US") {
+					this.type = item.name_en;
+				}
+				if (this.language == "es-ES") {
+					this.type = item.name_es;
+				}
+				if (this.language == "it-IT") {
+					this.type = item.name_ita;
+				}
+			},
+			next() {
+				this.show = false;
+				this.show1 = true;
+				this.type1 = this.type;
+				this.container();
+			},
+			activea(item, idx) {
+				this.datechan = idx;
+				this.sum = item.sum;
+				this.unit_price = item.unit_price;
+				this.recommend_weight = item.recommend_weight;
+				this.containid = item.id;
+				this.weight_total = item.weight_total;
+				if (this.language == "zh-CN") {
+					this.containname = item.name_cn;
+				}
+				if (this.language == "en-US") {
+					this.containname = item.name_en;
+				}
+				if (this.language == "es-ES") {
+					this.containname = item.name_es;
+				}
+				if (this.language == "it-IT") {
+					this.containname = item.name_ita;
+				}
+			},
+			//确定
+			confirm() {
+				this.show1 = false;
+				this.containname1 = this.containname;
+				this.recommendweight();
+				this.config();
+			},
+			// 取消
+			close() {
+				this.show = false;
+				this.show1 = false;
+			},
+			//提交订单
+			topay() {
+				uni.$u.http
+					.post("/api/order", {
+						address_id: this.addinfo.id, //3	是	String	地址ID
+						goods_id: this.goodinfo.id, //65	是	String	商品id
+						goods_num: this.value, //2	是	String	商品数量
+						sku_item_id: this.sku_info.id, //60	是	String	规格id
+						cart_ids: this.stringcheck, //8,9	是	String	购物车id
+						remark: "", //备注	是	String	备注
+						merchant_goods_id: this.goodinfo.merchant_goods_id || "", //39	是	String	团长商品id
+						container_id: this.containid, //1	是	String	货柜id
+						share_member_id: this.share_merchant_id, //	是	String	分享团长id 分享商品的时候传
+						belong: this.goodinfo.source || "", //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+					})
+					.then((res) => {
+						console.log("share_merchant_id", this.share_merchant_id);
+						console.log(res);
+						uni.navigateTo({
+							// url: '/pageA/payorder?sum=' + (Number(this.sum*10000+ Number(this.sku_info.discount_price)*Number(this.value)*10000))/10000 +'&orderid=' + res.id
+							url: "/pageA/payorder?orderid=" + res.id + "&sum=" + res.amount,
+						});
+					})
+					.catch(() => {});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.toptitle {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  // font-size: 22rpx;
-  color: #222222;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-  // width: 148rpx;
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 1;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  word-break: break-all;
-}
+	.toptitle {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		// font-size: 22rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+		// width: 148rpx;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-line-clamp: 1;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		word-break: break-all;
+	}
 
-::v-deep .u-status-bar {
-  height: 0 !important;
-}
+	::v-deep .u-status-bar {
+		height: 0 !important;
+	}
 
-.confirm {
-  width: 398rpx;
-  height: 84rpx;
-  background: #f83224;
-  border-radius: 42rpx;
-  text-align: center;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.confirm {
+		width: 398rpx;
+		height: 84rpx;
+		background: #f83224;
+		border-radius: 42rpx;
+		text-align: center;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.cancel {
-  width: 280rpx;
-  height: 84rpx;
-  border-radius: 42rpx;
-  border: 2rpx solid rgba(151, 151, 151, 0.3);
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 32rpx;
-  color: #444444;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-}
+	.cancel {
+		width: 280rpx;
+		height: 84rpx;
+		border-radius: 42rpx;
+		border: 2rpx solid rgba(151, 151, 151, 0.3);
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #444444;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+	}
 
-.enbottom {
-  width: 750rpx;
-  height: 166rpx;
-  background: #ffffff;
-  position: absolute;
-  left: 0rpx;
-  bottom: 0;
-  padding: 0 24rpx;
-  box-sizing: border-box;
-}
+	.enbottom {
+		width: 750rpx;
+		height: 166rpx;
+		background: #ffffff;
+		position: absolute;
+		left: 0rpx;
+		bottom: 0;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
 
-.mone {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #f83224;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.mone {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #f83224;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.yundate {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 550;
-  font-size: 32rpx;
-  color: #333333;
-  line-height: 44rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.yundate {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 550;
+		font-size: 32rpx;
+		color: #333333;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.chest {
-  font-family: SFPro, SFPro;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #555555;
-  line-height: 28rpx;
-  text-align: left;
-  font-style: normal;
-}
+	.chest {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #555555;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
 
-.act {
-  width: 702rpx;
-  height: 164rpx;
-  background: #ffffff;
-  border-radius: 12rpx;
-  padding: 24rpx 20rpx;
-  box-sizing: border-box;
-  border: 1rpx solid #f83224;
-}
+	.act {
+		width: 702rpx;
+		height: 164rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx 20rpx;
+		box-sizing: border-box;
+		border: 1rpx solid #f83224;
+	}
 
-.transport {
-  width: 702rpx;
-  height: 164rpx;
-  background: #ffffff;
-  border-radius: 12rpx;
-  padding: 24rpx 20rpx;
-  box-sizing: border-box;
-}
+	.transport {
+		width: 702rpx;
+		height: 164rpx;
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx 20rpx;
+		box-sizing: border-box;
+	}
 
-.nextto {
-  width: 702rpx;
-  height: 84rpx;
-  background: #f83224;
-  border-radius: 44rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #ffffff;
-  line-height: 84rpx;
-  text-align: center;
-  font-style: normal;
-  margin-top: 108rpx;
-}
+	.nextto {
+		width: 702rpx;
+		height: 84rpx;
+		background: #f83224;
+		border-radius: 44rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #ffffff;
+		line-height: 84rpx;
+		text-align: center;
+		font-style: normal;
+		margin-top: 108rpx;
+	}
 
-.logname {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #333333;
-  line-height: 40rpx;
-  text-align: right;
-  font-style: normal;
-  overflow: hidden;
-  width: 220rpx;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: center;
-  word-break: break-all;
-}
+	.logname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: right;
+		font-style: normal;
+		overflow: hidden;
+		width: 220rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		text-align: center;
+		word-break: break-all;
+	}
 
-.wei {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 32rpx;
-  color: #f83224;
-  line-height: 40rpx;
-  text-align: right;
-  font-style: normal;
-  margin-top: 8rpx;
-}
+	.wei {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #f83224;
+		line-height: 40rpx;
+		text-align: right;
+		font-style: normal;
+		margin-top: 8rpx;
+	}
 
-.active {
-  width: 218rpx;
-  height: 148rpx;
-  background: rgba(247, 50, 36, 0.05);
-  border-radius: 8rpx;
-  border: 1rpx solid #f83224;
-}
+	.active {
+		width: 218rpx;
+		height: 148rpx;
+		background: rgba(247, 50, 36, 0.05);
+		border-radius: 8rpx;
+		border: 1rpx solid #f83224;
+	}
 
-.unactive {
-  width: 218rpx;
-  height: 148rpx;
-  border-radius: 12rpx;
-  border: 1rpx solid #c3c3c3;
-}
+	.unactive {
+		width: 218rpx;
+		height: 148rpx;
+		border-radius: 12rpx;
+		border: 1rpx solid #c3c3c3;
+	}
 
-.poptitle {
-  width: 142rpx;
-  height: 50rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 600;
-  font-size: 36rpx;
-  color: #333333;
-  text-align: center;
-  width: 100%;
-}
+	.poptitle {
+		width: 142rpx;
+		height: 50rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 36rpx;
+		color: #333333;
+		text-align: center;
+		width: 100%;
+	}
 
-.back {
-  background: rgba(244, 244, 244, 1);
-  padding: 20rpx 24rpx;
-  box-sizing: border-box;
+	.back {
+		background: rgba(244, 244, 244, 1);
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
 
-  .btn {
-    width: 750rpx;
-    height: 166rpx;
-    background: #ffffff;
-    box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    padding: 0 24rpx 5rpx 5rpx;
-    box-sizing: border-box;
+		.btn {
+			width: 750rpx;
+			height: 166rpx;
+			background: #ffffff;
+			box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 0 24rpx 5rpx 5rpx;
+			box-sizing: border-box;
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 48rpx;
-      color: #f83224;
-      line-height: 38rpx;
-      text-align: left;
-      font-style: normal;
-      // font-weight: 500;
-      font-weight: bold;
-    }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 48rpx;
+				color: #f83224;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+				// font-weight: 500;
+				font-weight: bold;
+			}
 
-    .kg {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #333333;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.kg {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .order {
-      width: 232rpx;
-      height: 80rpx;
-      background: #f83224;
-      border-radius: 40rpx;
-      font-family: PingFangTC, PingFangTC;
-      font-weight: 500;
-      font-size: 32rpx;
-      color: #ffffff;
-      line-height: 80rpx;
-      text-align: center;
-      font-style: normal;
-      margin-left: 20rpx;
-    }
-  }
+			.order {
+				width: 232rpx;
+				height: 80rpx;
+				background: #f83224;
+				border-radius: 40rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #ffffff;
+				line-height: 80rpx;
+				text-align: center;
+				font-style: normal;
+				margin-left: 20rpx;
+			}
+		}
 
-  //商品相关
-  .abount {
-    padding: 28rpx 24rpx;
-    box-sizing: border-box;
-    background: #ffffff;
-    border-radius: 16rpx;
-    width: 702rpx;
+		//商品相关
+		.abount {
+			padding: 28rpx 24rpx;
+			box-sizing: border-box;
+			background: #ffffff;
+			border-radius: 16rpx;
+			width: 702rpx;
 
-    .zong {
-      width: 654rpx;
-      padding: 22rpx 0 0 0;
-      border-top: 2rpx solid rgba(151, 151, 151, 0.1);
-      margin-top: 32rpx;
+			.zong {
+				width: 654rpx;
+				padding: 22rpx 0 0 0;
+				border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+				margin-top: 32rpx;
 
-      .small {
-        font-family: PingFangTC, PingFangTC;
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #444444;
-        line-height: 34rpx;
-        text-align: left;
-        font-style: normal;
-      }
+				.small {
+					font-family: PingFangTC, PingFangTC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #444444;
+					line-height: 34rpx;
+					text-align: left;
+					font-style: normal;
+				}
 
-      .mon {
-        font-family: HarmonyOS_Sans_Medium;
-        font-size: 28rpx;
-        color: #f83224;
-        line-height: 38rpx;
-        text-align: left;
-        font-style: normal;
-        margin-left: 12rpx;
-        font-weight: bold;
-      }
-    }
+				.mon {
+					font-family: HarmonyOS_Sans_Medium;
+					font-size: 28rpx;
+					color: #f83224;
+					line-height: 38rpx;
+					text-align: left;
+					font-style: normal;
+					margin-left: 12rpx;
+					font-weight: bold;
+				}
+			}
 
-    .back {
-      background: rgba(244, 244, 244, 1);
-      padding: 22rpx 16rpx;
-      box-sizing: border-box;
-      margin-top: 10rpx;
-      // margin-bottom: 20rpx;
-    }
+			.back {
+				background: rgba(244, 244, 244, 1);
+				padding: 22rpx 16rpx;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				// margin-bottom: 20rpx;
+			}
 
-    .name {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 28rpx;
-      color: #222222;
-      line-height: 38rpx;
-      text-align: left;
-      font-style: normal;
-      font-weight: 600;
-    }
-  }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+				font-weight: 600;
+			}
+		}
 
-  .recommend {
-    margin-top: 20rpx;
+		.recommend {
+			margin-top: 20rpx;
 
-    .title {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 22rpx;
-      color: #222222;
-      line-height: 32rpx;
-      text-align: left;
-      font-style: normal;
-      width: 148rpx;
-      height: 64rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -webkit-line-clamp: 2;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      word-break: break-all;
-    }
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #222222;
+				line-height: 32rpx;
+				text-align: left;
+				font-style: normal;
+				width: 148rpx;
+				height: 64rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				-webkit-line-clamp: 2;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				word-break: break-all;
+			}
 
-    .top {
-      width: 702rpx;
-      height: 64rpx;
-      background: linear-gradient(
-        180deg,
-        #ffe7e3 0%,
-        rgba(255, 255, 255, 1) 100%
-      );
-      border-radius: 16rpx 16rpx 0 0;
-      padding: 24rpx 22rpx;
-      box-sizing: border-box;
-    }
+			.top {
+				width: 702rpx;
+				height: 64rpx;
+				background: linear-gradient(180deg,
+						#ffe7e3 0%,
+						rgba(255, 255, 255, 1) 100%);
+				border-radius: 16rpx 16rpx 0 0;
+				padding: 24rpx 22rpx;
+				box-sizing: border-box;
+			}
 
-    .bottom {
-      padding: 0 20rpx 22rpx;
-      box-sizing: border-box;
-      background: #fff;
-    }
-  }
+			.bottom {
+				padding: 0 20rpx 22rpx;
+				box-sizing: border-box;
+				background: #fff;
+			}
+		}
 
-  //物流
-  .logistics {
-    width: 702rpx;
-    // height: 96rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 28rpx 22rpx;
-    box-sizing: border-box;
-    margin-top: 20rpx;
+		//物流
+		.logistics {
+			width: 702rpx;
+			// height: 96rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 28rpx 22rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
 
-    .change {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #f83224;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      margin-right: 8rpx;
-    }
-  }
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #f83224;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 8rpx;
+			}
+		}
 
-  //商城
-  .shop {
-    width: 702rpx;
-    // height: 322rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 30rpx 24rpx;
-    margin-top: 20rpx;
-    box-sizing: border-box;
+		//商城
+		.shop {
+			width: 702rpx;
+			// height: 322rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 30rpx 24rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
 
-    .bu {
-      width: 120rpx;
-      height: 40rpx;
-      border-radius: 20rpx;
-      border: 1rpx solid rgba(151, 151, 151, 0.3);
-    }
+			.bu {
+				width: 120rpx;
+				height: 40rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid rgba(151, 151, 151, 0.3);
+			}
 
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 24rpx;
-      color: #f83224;
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      font-weight: 600;
-    }
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 24rpx;
+				color: #f83224;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				font-weight: 600;
+			}
 
-    .name {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 30rpx;
-      color: #222222;
-      line-height: 42rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 10rpx;
-    }
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #222222;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 10rpx;
+			}
 
-    .weight {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: rgba(34, 34, 34, 0.6);
-      line-height: 34rpx;
-      text-align: left;
-      font-style: normal;
-      margin-top: 16rpx;
-    }
-  }
+			.weight {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: rgba(34, 34, 34, 0.6);
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 16rpx;
+			}
+		}
 
-  // 地址
-  .address {
-    width: 702rpx;
-    // height: 182rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-sizing: border-box;
+		// 地址
+		.address {
+			width: 702rpx;
+			// height: 182rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			padding: 32rpx 24rpx;
+			box-sizing: border-box;
 
-    .add {
-      font-family: SFPro, SFPro;
-      font-weight: 500;
-      font-size: 32rpx;
-      color: #222222;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-    }
+			.add {
+				font-family: SFPro, SFPro;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
 
-    .info {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #555555;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-      margin-top: 20rpx;
-    }
-  }
-}
+			.info {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 20rpx;
+			}
+		}
+	}
 
-.minus {
-  width: 22px;
-  height: 22px;
-  border-width: 1px;
-  border-color: #e6e6e6;
-  border-style: solid;
-  border-top-left-radius: 100px;
-  border-top-right-radius: 100px;
-  border-bottom-left-radius: 100px;
-  border-bottom-right-radius: 100px;
-  @include flex;
-  justify-content: center;
-  align-items: center;
-}
+	.minus {
+		width: 22px;
+		height: 22px;
+		border-width: 1px;
+		border-color: #e6e6e6;
+		border-style: solid;
+		border-top-left-radius: 100px;
+		border-top-right-radius: 100px;
+		border-bottom-left-radius: 100px;
+		border-bottom-right-radius: 100px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+	}
 
-.input {
-  padding: 0 10px;
-}
+	.input {
+		padding: 0 10px;
+	}
 
-.plus {
-  width: 22px;
-  height: 22px;
-  background-color: #ff0000;
-  border-radius: 50%;
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  justify-content: center;
-  align-items: center;
-}
-</style>
+	.plus {
+		width: 22px;
+		height: 22px;
+		background-color: #ff0000;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+</style>

+ 1 - 1
pageA/payorder.vue

@@ -50,7 +50,7 @@
 				<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.Marginpayment}}</view>
 						<view class="" style="
                 margin-top: 10rpx;
                 color: rgba(248, 50, 36, 1);

+ 24 - 90
pageA/productdetails.vue

@@ -143,7 +143,7 @@
 							<view class="redback u-flex">
 								<uni-rate network allow-half :readonly="true" active-color="red"
 									color="rgba(255, 27, 0, 0.5)" :size="8" v-model="rate" max="5" />
-								<text style="margin-left: 8rpx">{{ rate }}</text>    
+								<text style="margin-left: 8rpx">{{ rate }}</text>
 							</view>
 							<view class="" style="margin-top: 20rpx"></view>
 							<view class="u-flex" style="margin-top: 20rpx">
@@ -350,7 +350,7 @@
         ">
 				<view class="u-flex" style="flex-direction: column; justify-content: center">
 					<image src="../static/images/index/serve.png" style="width: 138rpx; height: 34rpx" mode=""></image>
-					<text class="info"> 售前售后 安心无忧购物 </text>
+					<text class="info"> {{i18n.sales}} </text>
 				</view>
 				<view class="" style="position: absolute; top: 48rpx; right: 24rpx" @click="close()">
 					<u-icon name="close" style="width: 22rpx; height: 22rpx"></u-icon>
@@ -418,7 +418,7 @@
 				<u-icon name="close" @click="close()" color="#fff" size="28"></u-icon>
 			</view>
 			<image :src="picture2" mode="widthFix"></image>
-			<view class="button" style="width: 658rpx" @click="saveImage">保存到相册</view>
+			<view class="button" style="width: 658rpx" @click="saveImage">{{i18n.album}}</view>
 		</u-popup>
 		<l-painter custom-style="position: fixed; left: 200%" ref="poster"
 			css="width: 538rpx; height:900rpx; background: #fff;padding:24rpx">
@@ -430,7 +430,8 @@
 			<l-painter-text :text="goodinfoname" css=" padding-top: 20rpx;display:block" />
 			<l-painter-qrcode :text="'https://cbec.hdlkeji.com/cbec?id='+id+'&userid='+userid"
 				css="width: 132rpx; height: 132rpx;margin-top:44rpx;margin-left:174rpx" />
-			<l-painter-text text="长按识别查看" css=" padding-top: 20rpx;text-align:center;display:block;color:#777777" />
+			<l-painter-text :text="i18n.identify"
+				css=" padding-top: 20rpx;text-align:center;display:block;color:#777777" />
 		</l-painter>
 	</view>
 </template>
@@ -440,90 +441,13 @@
 	import {
 		conn
 	} from '@/utils/WebIM';
+import list from '../uview-ui/libs/config/props/list';
 	export default {
 		data() {
 			return {
 				share_merchant_id: '',
-				elementList: {
-					// images: [ //图片对象
-					// 	{
-					// 		path: "https://img2.baidu.com/it/u=1028011339,1319212411&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=313", //图片路径[必填]
-					// 		dx: 15, //左上角x轴[必填]
-					// 		dy: 15, //左上角y轴[必填]
-					// 		dWidth: 270, //宽度[必填]
-					// 		dHeight: 270, //高度[必填]
-					// 		sx: 0, //绘画的宽度[选填]
-					// 		sy: 0, //绘画的高度[选填]
-					// 	}
-					// ],
-					images: [ //图片对象
-						{
-							path: "https://wxls-cms.oss-cn-hangzhou.aliyuncs.com/online/2024-04-18/218da022-f4bf-456a-99af-5cb8e157f7b8.jpg", //图片路径[必填]
-							dx: 15, //左上角x轴[必填]
-							dy: 15, //左上角y轴[必填]
-							dWidth: 270, //宽度[必填]
-							dHeight: 270, //高度[必填]
-							sx: 0, //绘画的宽度[选填]
-							sy: 0, //绘画的高度[选填]
-						}
-					],
-					text: [ //渲染文字
-						{
-							value: "邀请码:", //渲染的文字
-							color: "#333333", //文字颜色[选填]
-							size: "18", //大小[选填]
-							font: "PingFang SC-Regular, PingFang SC;", //字体[选填]
-							x: 13, //左上角x轴[必填]
-							y: 330, //左上角y轴[必填]
-							// backgroundColor: "#ffffff", //背景色
-							maxWidth: "270", //字体最大宽度
-							maxHeight: "", //字体最大高度
-						}, {
-							value: "邀请码:", //渲染的文字
-							color: "#F83224", //文字颜色[选填]
-							size: "18", //大小[选填]
-							font: "PingFang SC-Regular, PingFang SC;", //字体[选填]
-							x: 13, //左上角x轴[必填]
-							y: 310, //左上角y轴[必填]
-							// backgroundColor: "#ffffff", //背景色
-							maxWidth: "", //字体最大宽度
-							maxHeight: "", //字体最大高度
-						}, {
-							value: "长按识别查看", //渲染的文字
-							color: "#777777", //文字颜色[选填]
-							size: "10", //大小[选填]
-							font: "PingFang SC-Regular, PingFang SC;", //字体[选填]
-							x: 13, //左上角x轴[必填]
-							y: 480, //左上角y轴[必填]
-							// backgroundColor: "#ffffff", //背景色
-							maxWidth: "", //字体最大宽度
-							maxHeight: "", //字体最大高度
-						}
-					],
-					qr: [ //渲染的二维码
-						{
-							url: "limeui.qcoon.cn", //二维码文字[必填]
-							dx: 100, //左上角x轴[必填]
-							dy: 380, //左上角y轴[必填]
-							size: 71, //二维码大小
-							color: "#333333", //二维码前景色
-							backgroundColor: "#ffffff" //二维码背景色
-						}
-					]
-
-				},
 				toView: "",
 				imagea: false,
-				list1: [{
-						name: "商品",
-					},
-					{
-						name: "评价",
-					},
-					{
-						name: "详情",
-					},
-				],
 				goodinfoname: '',
 				goodinfoyuan: '',
 				current: 0,
@@ -560,6 +484,16 @@
 			i18n() {
 				return this.$t("index");
 			},
+			list1() {
+				var List = [{
+					name: this.i18n.mineCommodity,
+				}, {
+					name: this.i18n.evaluate,
+				}, {
+					name: this.i18n.particulars,
+				}]
+				return List
+			}
 		},
 		onLoad(options) {
 			console.log(options);
@@ -654,7 +588,7 @@
 							filePath: wx.env.USER_DATA_PATH + '/img.jpg',
 							success: function(res) {
 								uni.showToast({
-									title: '保存成功'
+									title: this.i18n.savesuccessfully
 								})
 								that.imagea = false
 							},
@@ -690,7 +624,7 @@
 				let msg = new WebIM.message('txt', id); // 创建文本消息
 				msg.set({
 					type: "txt",
-					msg: "商品信息",
+					msg: this.i18n.merchandiseNews,
 					to: this.goodinfo.merchant.member.easemob_username,
 					chatType: "singleChat",
 					ext: {
@@ -700,7 +634,7 @@
 							'image': that.goodinfo.image,
 							'discount_price': that.goodinfo.discount_price,
 							'fu': that.fu,
-							'id':that.id
+							'id': that.id
 						},
 						'user_other': that.goodinfo.merchant,
 						'user': useinfo,
@@ -743,10 +677,10 @@
 					})
 					.then((res) => {
 						if (res == "ok1") {
-							this.$u.toast("取关成功");
+							this.$u.toast(this.i18n.shutdown);
 							this.detail(this.id);
 						} else {
-							this.$u.toast("关注成功");
+							this.$u.toast(this.i18n.Focus);
 							this.detail(this.id);
 						}
 					})
@@ -925,7 +859,7 @@
 							.share_merchant_id
 					});
 				} else {
-					this.$u.toast("库存为0");
+					this.$u.toast(this.i18n.understock);
 					this.show = false;
 				}
 				// console.log(JSON.stringify(this.sku_info));
@@ -939,7 +873,7 @@
 			joincart() {
 				this.show = false;
 				if (this.sku_info.stock_total == 0) {
-					this.$u.toast("添加失败,库存为0");
+					this.$u.toast(this.i18n.understock);
 				} else {
 					uni.$u.http
 						.post("/api/cart/save", {
@@ -951,7 +885,7 @@
 							share_member_id: this.share_merchant_id, //是 String 分享团长id
 						})
 						.then((res) => {
-							this.$u.toast("添加成功");
+							this.$u.toast(this.i18n.successfullyAdded);
 						})
 						.catch(() => {});
 				}

+ 18 - 2
pageA/service/service.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="chat-pages">
-		<u-navbar title="在线客服" :safeAreaInsetTop="true" :placeholder='true' :fixed='true'>
+		<u-navbar :title="i18n.customerService" :safeAreaInsetTop="true" :placeholder='true' :fixed='true'>
 			<view class="u-nav-slot u-flex" slot="left">
 				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
 				<image src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
@@ -22,6 +22,17 @@
 						{{item.msg}}
 					</view>
 				</view>
+				<view class="" v-if="item.type=='img'" style="margin: 0 20rpx;">
+					<img :src="item.url" alt="" style="width: 200rpx;height: 200rpx;" />
+				</view>
+				<view style="max-width: 80%;" v-if="item.type == 'audio'">
+					<view class="chat-text u-flex acenter jend" style="background: #D3E5FB;max-width: 550rpx;"
+						@click="playaudio(item.url)">
+						<image src="../static/images/yuyin-left.png" mode="" style="width: 20rpx;height: 20rpx;">
+						</image>
+						<text :style="'padding-left: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
+					</view>
+				</view>
 				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'shopinfo'"
 					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'shopinfo')">
 					<view class="u-flex ">
@@ -111,6 +122,11 @@
 		onShow() {
 			this.getdata()
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			callphone() {
 				uni.$u.http.get('/api/config', {
@@ -217,7 +233,7 @@
 						console.log('res', res);
 						// 成功获取历史消息。
 						if (res.isLast) {
-							this.loadText = '已无更多数据';
+							this.loadText = this.i18n.Nofurtherdata;
 						}
 						this.list = res.messages.reverse()
 						console.log(this.list);

BIN
pageA/static/images/yuyin-left.png


BIN
pageA/static/images/yuyin-right.png


+ 1 - 1
pageA/subsidy.vue

@@ -142,7 +142,7 @@
 				}
 				// }
 			} else {
-				this.$u.toast('已无更多数据')
+				this.$u.toast(this.i18n.Nofurtherdata)
 			}
 		},
 		computed: {

+ 2 - 2
pageB/ParcelExpress.vue

@@ -260,11 +260,11 @@
 			//物品信息
 			goods() {
 				if(JSON.stringify(this.topadd)=="{}"){
-					this.$u.toast('请填写寄件地址')
+					this.$u.toast(this.i18n.informat)
 					return 
 				}
 				if(JSON.stringify(this.bottomadd)=="{}"){
-					this.$u.toast('请填写收件地址')
+					this.$u.toast(this.i18n.informate)
 					return 
 				}
 				var that = this

+ 1 - 1
pageB/account.vue

@@ -6,7 +6,7 @@
 			<image src="/static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar :autoBack ='true' title='寄快递' bgColor="rgba(255, 210, 210, 1)" :placeholder='true' :safeAreaInsetTop="true"
+			<u-navbar :autoBack ='true' :title='i18n.delivery' bgColor="rgba(255, 210, 210, 1)" :placeholder='true' :safeAreaInsetTop="true"
 				style="position: absolute;z-index: 110;">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>

+ 1 - 1
pageB/end.vue

@@ -6,7 +6,7 @@
 			<image src="/static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
+			<u-navbar :autoBack='true' :title='i18n.delivery' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
 				:safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>

+ 4 - 4
pageB/goods.vue

@@ -173,11 +173,11 @@
 		methods: {
 			enter() {
 				if (this.goodid == '') {
-					this.$u.toast('请选择邮寄物品')
+					this.$u.toast(this.i18n.itemtoSend)
 					return
 				}
 				if (this.goodtype == '') {
-					this.$u.toast('请选择物品类型')
+					this.$u.toast(this.i18n.selectitemType)
 					return
 				}
 				const eventchannel = this.getOpenerEventChannel();
@@ -195,14 +195,14 @@
 			},
 			changeweight() {
 				if (this.weight == 1) {
-					this.$u.toast('重量不能小于1')
+					this.$u.toast(this.i18n.Weightnotlessthan)
 				} else {
 					this.weight--
 				}
 			},
 			changenumber() {
 				if (this.number == 1) {
-					this.$u.toast('数量不能小于1')
+					this.$u.toast(this.i18n.cannotbelessthan)
 				} else {
 					this.number--
 				}

+ 2 - 2
pageB/orderinfo.vue

@@ -51,7 +51,7 @@
 		onLoad(options) {
 			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
 			console.log(this.orderinfo);
-			this.$u.toast(this.i18n.successful + this.i18n.MyOrder)
+			this.$u.toast(this.i18n.successful + this.i18n.myPackage + '-' + this.i18n.Vieworder)
 		},
 		computed: {
 			i18n() {
@@ -61,7 +61,7 @@
 		methods: {
 			leftClick() {
 				uni.switchTab({
-					url: '/pages/mine/mine'
+					url: '/pages/express/express'
 				})
 			}
 		}

+ 1 - 1
pageB/parcel.vue

@@ -68,7 +68,7 @@
 					logistics_no: this.logistics_no, //11111111	是	String	快递单号
 					estimated_weight: this.estimated_weight, //	222	是	String	包裹重量
 				}).then((res) => {
-					this.$u.toast('添加成功')
+					this.$u.toast(this.i18n.successfullyAdded)
 					// uni.navigateTo({
 					// 	url:'pageB/myPackage'
 					// })

+ 2 - 2
pageB/recipientinfo.vue

@@ -60,7 +60,7 @@
 				<view class="u-flex">
 					<view class="">
 						<u-checkbox-group v-model="checkboxValue1" placement="row" @change="checkboxChange">
-							<u-checkbox shape='circle' :customStyle="{marginRight: '4px'}" :name="active">
+							<u-checkbox activeColor="red" shape='circle' :customStyle="{marginRight: '4px'}" :name="active">
 							</u-checkbox>
 						</u-checkbox-group>
 					</view>
@@ -206,7 +206,7 @@
 					//   uni.$u.toast("该国家没有城市数据,请直接填写详细地址");
 					// }
 				} else {
-					uni.$u.toast("请先选择国家");
+					uni.$u.toast(this.i18n.Pleasecountry);
 				}
 			},
 			checkboxChange(n) {

+ 1 - 1
pageB/search.vue

@@ -3,7 +3,7 @@
 		<!-- 搜索 -->
 		<view class="u-flex u-row-between">
 			<view class="" style="width: 622rpx;">
-				<u-search  @focus='focus' placeholder="请输入物品名称" v-model="keyword"
+				<u-search  @focus='focus' :placeholder="i18n.Please" v-model="keyword"
 					:showAction='false'></u-search>
 			</view>
 			<text @click="clear" v-if="keyword==''">{{i18n.Cancel}}</text>

+ 27 - 24
pages/cart/cart.vue

@@ -91,7 +91,7 @@
                   >
                   </image>
                   <view class="down" v-if="chid.status == 'down'">
-                    <view class="sold"> 商品下架 </view>
+                    <view class="sold"> {{i18n.offtheshelves}} </view>
                   </view>
                 </view>
                 <view
@@ -183,7 +183,7 @@
                             name: chid.cart.id,
                           })
                         "
-                        >删除</view
+                        >{{i18n.delete}}</view
                       >
                     </view>
                     <view
@@ -214,7 +214,7 @@
         src="../../static/mine/355.png"
         mode="scaleToFill"
       />
-      <text class="back-text">顶部</text>
+      <text class="back-text">{{i18n.top}}</text>
     </view>
     <kj-tabbar
       ref="tabbar1"
@@ -246,20 +246,6 @@ export default {
       num: false,
       goodsWeight: 0, //商品重量
       goodsPrice: 0, //商品价格
-      options2: [
-        {
-          text: "移入关注",
-          style: {
-            backgroundColor: "#FFB115",
-          },
-        },
-        {
-          text: "删除",
-          style: {
-            backgroundColor: "#F83224",
-          },
-        },
-      ],
       tabarheight: "",
       removeProducts: 0, //已下架的商品数量
     };
@@ -269,6 +255,23 @@ export default {
     i18n() {
       return this.$t("index");
     },
+	options2(){
+		var options = [
+			{
+			  text: this.i18n.Shiftfocus,
+			  style: {
+			    backgroundColor: "#FFB115",
+			  },
+			},
+			{
+			  text: this.i18n.delete,
+			  style: {
+			    backgroundColor: "#F83224",
+			  },
+			}
+		]
+		return options
+	}
   },
   onLoad() {
     const systemInfo = wx.getSystemInfoSync();
@@ -334,8 +337,8 @@ export default {
                 .then((res) => {
                   this.$refs.uToast.show({
                     type: "default",
-                    title: "默认主题",
-                    message: "删除成功",
+                    title: this.i18n.defaultTheme,
+                    message: this.i18n.successfullydelete,
                   });
                   //删除后关闭滑动打开的单元格
                   this.$refs.show.forEach((item) => item.closeHandler(true));
@@ -364,8 +367,8 @@ export default {
         .then((res) => {
           this.$refs.uToast.show({
             type: "default",
-            title: "默认主题",
-            message: "删除成功",
+            title: this.i18n.defaultTheme,
+            message: this.i18n.successfullydelete,
           });
           this.checkboxValue1 = [];
           this.getShopCarList();
@@ -468,7 +471,7 @@ export default {
       if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
         this.$refs.tabbar1.cancelAll();
       } else {
-        this.$refs.tabbar1.cancelAll("取消");
+        this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
       }
 
       //将选中的商品价格相加
@@ -520,12 +523,12 @@ export default {
         this.checkboxValue1.length <
         this.goodsNum - this.removeProducts
       ) {
-        this.$refs.tabbar1.cancelAll("取消");
+        this.$refs.tabbar1.cancelAll(this.i18n.Cancel);
       }
     },
     //购物车全选
     allSelect() {
-      const all = this.$refs.tabbar1.cancelAll("全选");
+      const all = this.$refs.tabbar1.cancelAll(this.i18n.selectall);
       if (
         this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
         all.length == 0

+ 1 - 1
pages/express/express.vue

@@ -409,7 +409,7 @@
 						that.$refs.child.transport();
 					}, 800)
 				} else {
-					this.$u.toast('请先选择城市')
+					this.$u.toast(this.i18n.selectcity)
 				}
 			},
 			//改变地址

+ 1 - 1
pages/index/index.vue

@@ -276,7 +276,7 @@
 					this.goods(this.parent_id)
 				}
 			} else {
-				this.$u.toast('已无更多数据')
+				this.$u.toast(this.i18n.Nofurtherdata)
 			}
 		},
 		onLoad(options) {

+ 9 - 4
pages/login/login.vue

@@ -25,10 +25,10 @@
 				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">
 				</u-checkbox>
 			</u-checkbox-group>
-			<text class="fontYin">我已阅读并同意</text>
-			<text class="fontYin" style="color: #f83224" @click="xieyi('user')">《用户协议》</text>
-			<text class="fontYin"></text>
-			<text class="fontYin" style="color: #f83224" @click="xieyi('private')">《隐私协议》</text>
+			<text class="fontYin">{{i18n.readandAgree}}</text>
+			<text class="fontYin" style="color: #f83224" @click="xieyi('user')">《{{i18n.useragreement}}》</text>
+			<text class="fontYin">{{i18n.and}}</text>
+			<text class="fontYin" style="color: #f83224" @click="xieyi('private')">《{{i18n.Privacyagreement}}》</text>
 		</view>
 	</view>
 </template>
@@ -50,6 +50,11 @@
 				changea: [],
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
 		methods: {
 			//协议
 			xieyi(code) {

+ 2 - 2
pages/shopping/shopping.vue

@@ -79,7 +79,7 @@
 								style="padding:10rpx 20rpx 0 26rpx;width: 85%;position: relative;z-index: 1;">
 								<view class="" style="margin-top: 10rpx;">
 									<text class="money">¥</text>
-									<text class="money" style="font-size: 40rpx;">{{item.goods.price}}</text>
+									<text class="money" style="font-size: 40rpx;">{{item.goods.discount_price}}</text>
 								</view>
 								<image src="../../static/shopping/shop.png" style="width: 82rpx;height: 38rpx;" mode="">
 								</image>
@@ -123,7 +123,7 @@
 		methods: {
 			onReachBottom() {
 				if (this.page == this.last_page) {
-					this.$u.toast('已无更多数据')
+					this.$u.toast(this.i18n.Nofurtherdata)
 				} else {
 					// if (this.current != 0) {
 					this.page++

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


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


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


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


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


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


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


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


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxss


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


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


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


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


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


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

@@ -1 +1 @@
-<view class="box data-v-7912a084"><view class="exp data-v-7912a084"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-7912a084" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="item u-flex u-row-between data-v-7912a084"><text class="data-v-7912a084">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-7912a084" bind:__l="__l"></u-radio></view></block></u-radio-group></view><view class="bottom data-v-7912a084"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-7912a084" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>
+<view class="box data-v-15dc6eed"><view class="exp data-v-15dc6eed"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-15dc6eed" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-15dc6eed"><text class="data-v-15dc6eed">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-15dc6eed" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-15dc6eed"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-15dc6eed" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>

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

@@ -1 +1 @@
-.box.data-v-7912a084{padding:20rpx 24rpx;box-sizing:border-box}.box .bottom.data-v-7912a084{width:750rpx;height:166rpx;background:#fff;padding:18rpx 32rpx;box-sizing:border-box;position:fixed;bottom:0;left:0}.box .bottom .btn.data-v-7912a084{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.box .item.data-v-7912a084{width:654rpx;height:112rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.box .exp.data-v-7912a084{width:702rpx;background:#fff;border-radius:16rpx;padding:0 20rpx}
+.box.data-v-15dc6eed{padding:20rpx 24rpx;box-sizing:border-box}.box .bottom.data-v-15dc6eed{width:750rpx;height:166rpx;background:#fff;padding:18rpx 32rpx;box-sizing:border-box;position:fixed;bottom:0;left:0}.box .bottom .btn.data-v-15dc6eed{width:686rpx;height:88rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.box .item.data-v-15dc6eed{width:654rpx;height:112rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.1)}.box .exp.data-v-15dc6eed{width:702rpx;background:#fff;border-radius:16rpx;padding:0 20rpx}

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

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

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

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

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

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

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


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


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


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

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

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

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

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


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


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

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

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-chat/kj-chat.js.map


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


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


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


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.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/mp-weixin/common/vendor.js


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


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


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


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


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


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


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


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


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


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


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

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

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

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

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

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

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

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

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


+ 3 - 13
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,15 +9,10 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.3",
+  "libVersion": "",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
   "condition": {
@@ -38,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

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