zhaogongxue 6 месяцев назад
Родитель
Сommit
79c3f1e0af
100 измененных файлов с 1370 добавлено и 1348 удалено
  1. 25 6
      components/kj-chat/kj-chat.vue
  2. 152 73
      pageA/chat/chat.vue
  3. 6 1
      pageA/chat/news.vue
  4. 259 0
      pageA/chat/search.vue
  5. 1 1
      pageA/confirm.vue
  6. 15 335
      pageA/rule/rule.vue
  7. 112 80
      pageA/service/service.vue
  8. 692 691
      pages.json
  9. BIN
      static/imagess/more5.png
  10. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.js
  11. 3 1
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.json
  12. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxml
  13. 0 0
      unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.wxss
  14. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  15. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.wxml
  16. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxss
  20. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.js
  21. 0 0
      unpackage/dist/build/mp-weixin/pageA/service/service.wxml
  22. 1 1
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js
  23. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  25. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  26. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json
  27. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  28. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  29. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json
  30. BIN
      unpackage/dist/build/mp-weixin/static/imagess/more5.png
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/search.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map
  40. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/search.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u--input/u--input.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  45. 1 0
      unpackage/dist/dev/mp-weixin/app.json
  46. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  47. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.js
  48. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-chat/kj-chat.wxml
  49. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js
  50. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-flow/kj-flow.js
  51. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-index/kj-index.js
  52. 0 0
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  53. 0 0
      unpackage/dist/dev/mp-weixin/pageA/changelange.js
  54. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.js
  55. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml
  56. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.js
  57. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml
  58. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.js
  59. 7 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.json
  60. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.wxml
  61. 84 0
      unpackage/dist/dev/mp-weixin/pageA/chat/search.wxss
  62. 0 0
      unpackage/dist/dev/mp-weixin/pageA/comment.js
  63. 0 0
      unpackage/dist/dev/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js
  64. 0 0
      unpackage/dist/dev/mp-weixin/pageA/confirm.js
  65. 0 0
      unpackage/dist/dev/mp-weixin/pageA/counter.js
  66. 0 0
      unpackage/dist/dev/mp-weixin/pageA/logisticsinfo.js
  67. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.js
  68. 0 0
      unpackage/dist/dev/mp-weixin/pageA/payorder.js
  69. 0 0
      unpackage/dist/dev/mp-weixin/pageA/productdetails.js
  70. 0 0
      unpackage/dist/dev/mp-weixin/pageA/rule/rule.js
  71. 0 0
      unpackage/dist/dev/mp-weixin/pageA/rule/rule.wxml
  72. 0 148
      unpackage/dist/dev/mp-weixin/pageA/rule/rule.wxss
  73. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.js
  74. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.wxml
  75. 0 0
      unpackage/dist/dev/mp-weixin/pageA/shoplist.js
  76. 0 0
      unpackage/dist/dev/mp-weixin/pageA/shoptype.js
  77. 0 0
      unpackage/dist/dev/mp-weixin/pageA/subsidy.js
  78. 0 0
      unpackage/dist/dev/mp-weixin/pageB/ParcelExpress.js
  79. 0 0
      unpackage/dist/dev/mp-weixin/pageB/Senderinfor.js
  80. 0 0
      unpackage/dist/dev/mp-weixin/pageB/account.js
  81. 0 0
      unpackage/dist/dev/mp-weixin/pageB/citychange.js
  82. 0 0
      unpackage/dist/dev/mp-weixin/pageB/delivery.js
  83. 0 0
      unpackage/dist/dev/mp-weixin/pageB/end.js
  84. 0 0
      unpackage/dist/dev/mp-weixin/pageB/expresstype.js
  85. 0 0
      unpackage/dist/dev/mp-weixin/pageB/goods.js
  86. 1 1
      unpackage/dist/dev/mp-weixin/pageB/index.js
  87. 0 0
      unpackage/dist/dev/mp-weixin/pageB/list/list.js
  88. 0 0
      unpackage/dist/dev/mp-weixin/pageB/myPackage.js
  89. 0 0
      unpackage/dist/dev/mp-weixin/pageB/orderinfo.js
  90. 0 0
      unpackage/dist/dev/mp-weixin/pageB/parcel.js
  91. 0 0
      unpackage/dist/dev/mp-weixin/pageB/recipientinfo.js
  92. 0 0
      unpackage/dist/dev/mp-weixin/pageB/search.js
  93. 0 0
      unpackage/dist/dev/mp-weixin/pageB/xieyi.js
  94. 0 0
      unpackage/dist/dev/mp-weixin/pageC/accountBalance/accountBalance.js
  95. 0 0
      unpackage/dist/dev/mp-weixin/pageC/accountCancellation/accountCancellation.js
  96. 0 0
      unpackage/dist/dev/mp-weixin/pageC/accountSecurity/accountSecurity.js
  97. 2 2
      unpackage/dist/dev/mp-weixin/pageC/accountSecurity/component/textRight.js
  98. 0 0
      unpackage/dist/dev/mp-weixin/pageC/accountSetup/accountSetup.js
  99. 0 0
      unpackage/dist/dev/mp-weixin/pageC/addEditAddress/addEditAddress.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/pageC/addEditAddress/component/selectCity.js

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

@@ -71,11 +71,11 @@
 						语音
 						语音
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="more-item u-flex-col u-col-center"
+				<view v-if="user_no!='13523652365'&&to=='13523652365'" class="more-item u-flex-col u-col-center"
 					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
 					style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
 					@click="show = true">
 					@click="show = true">
 					<view class="item-img u-flex u-row-center">
 					<view class="item-img u-flex u-row-center">
-						<image src="/static/imagess/more4.png" mode=""></image>
+						<image src="/static/imagess/more5.png" mode=""></image>
 					</view>
 					</view>
 					<view class="item-text">
 					<view class="item-text">
 						我的订单
 						我的订单
@@ -166,10 +166,12 @@
 				orderList: [],
 				orderList: [],
 				keywords: '',
 				keywords: '',
 				last_page: '',
 				last_page: '',
+				user_no: ''
 			}
 			}
 		},
 		},
 		created() {
 		created() {
 			this.getOrderList()
 			this.getOrderList()
+			this.user_no = uni.getStorageSync('user_no')
 		},
 		},
 
 
 		methods: {
 		methods: {
@@ -307,6 +309,19 @@
 						console.log("Fail", e);
 						console.log("Fail", e);
 					});
 					});
 			},
 			},
+			addinfo(text,from,to,id) {
+				uni.$u.http.post('/api/easemob/add', {
+					text:text,
+					send_time:new Date().getTime(),
+					form_id:from,
+					to_id:to,
+					easemob_log_id:id
+				}).then((res) => {
+					console.log(res);
+				}).catch(() => {
+
+				})
+			},
 			sendorder(item) {
 			sendorder(item) {
 				let _this = this
 				let _this = this
 				let useinfo = uni.getStorageSync("user_info");
 				let useinfo = uni.getStorageSync("user_info");
@@ -321,12 +336,14 @@
 					ext: {
 					ext: {
 						type: "orderinfo",
 						type: "orderinfo",
 						order: {
 						order: {
-							info:item
+							info: item
 						},
 						},
 						// user_other: that.goodinfo.merchant,
 						// user_other: that.goodinfo.merchant,
 						user: useinfo,
 						user: useinfo,
+						id:id
 					},
 					},
 					success: function(id, serverMsgId) {
 					success: function(id, serverMsgId) {
+						_this.addinfo(item.order.order_no,_this.user_no,'13523652365',id)
 						setTimeout(() => {
 						setTimeout(() => {
 							_this.$emit('success', true)
 							_this.$emit('success', true)
 						}, 800);
 						}, 800);
@@ -345,7 +362,6 @@
 					return
 					return
 				}
 				}
 				let id = conn.getUniqueId(); // 生成本地消息id
 				let id = conn.getUniqueId(); // 生成本地消息id
-
 				let msg = new WebIM.message('txt', id); // 创建文本消息
 				let msg = new WebIM.message('txt', id); // 创建文本消息
 				// console.log('msg',msg);
 				// console.log('msg',msg);
 				msg.set({
 				msg.set({
@@ -355,10 +371,13 @@
 					chatType: 'singleChat', // 设置为单聊
 					chatType: 'singleChat', // 设置为单聊
 					ext: {
 					ext: {
 						user_other: this.user_other,
 						user_other: this.user_other,
-						user: this.user
+						user: this.user,
+						id:id
 					},
 					},
 					success: function(id, serverMsgId) {
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
 						console.log('成功发送消息');
+						_this.addinfo(_this.text,_this.user_no,_this.to,id)
+						_this.text = ''
 						setTimeout(() => {
 						setTimeout(() => {
 							_this.$emit('success', true)
 							_this.$emit('success', true)
 						}, 800);
 						}, 800);
@@ -369,7 +388,7 @@
 				});
 				});
 				console.log('msg', msg);
 				console.log('msg', msg);
 				conn.send(msg.body);
 				conn.send(msg.body);
-				this.text = ''
+				
 
 
 				// let option = {
 				// let option = {
 				// 	// 消息类型。
 				// 	// 消息类型。

+ 152 - 73
pageA/chat/chat.vue

@@ -3,7 +3,8 @@
 		<u-navbar :border="false" :fixed='true' :placeholder='true'>
 		<u-navbar :border="false" :fixed='true' :placeholder='true'>
 			<view class="u-nav-slot" slot="left" style="display: flex;">
 			<view class="u-nav-slot" slot="left" style="display: flex;">
 				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
 				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
-				<text class="title">{{user_other.merchant_name || user_other.easemob_nickname}}</text>
+				<text
+					class="title">{{user_other.merchant_name || user_other.nickname ||user_other.easemob_nickname}}</text>
 			</view>
 			</view>
 			<view class="u-flex" slot="right" @click="goshop(user_other.id)">
 			<view class="u-flex" slot="right" @click="goshop(user_other.id)">
 				<view v-if="user_other.merchant_name" class="dian">{{i18n.store}}</view>
 				<view v-if="user_other.merchant_name" class="dian">{{i18n.store}}</view>
@@ -13,82 +14,119 @@
 			</view>
 			</view>
 		</u-navbar>
 		</u-navbar>
 
 
-
 		<view class="" style="height: 60rpx;"></view>
 		<view class="" style="height: 60rpx;"></view>
-
-		<view class="chat-item" v-for="(item,index) in list" :key="index">
-			<view class="chat-time">
-				{{renderTime(item.time)}}
-			</view>
-			<view class="chat-item-box u-flex u-col-top acenter" v-if="item.from == user_other_no">
-				<image :src="user_other.avatar || user_other.image" class="user-img" mode=""></image>
-				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
-					<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
-						{{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;" />
+		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: calc(100vh - 340rpx);">
+			<view :id="'msg'+ item.ext.id" class="chat-item" v-for="(item,index) in list" :key="index">
+				<view class="chat-time">
+					{{renderTime(item.time)}}
 				</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)">
-						<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 class="chat-item-box u-flex u-col-top acenter" v-if="item.from == user_other_no">
+					<image :src="user_other.avatar || user_other.image" class="user-img" mode=""></image>
+					<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
+						<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
+							{{item.msg}}
+						</view>
 					</view>
 					</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 ">
-						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
-						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
-							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text
-								class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+					<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>
 					</view>
-					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
-					<view class="chatfu">{{item.ext.order.fu}}</view>
-				</view>
-			</view>
-			<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
-				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
-					<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
-						{{item.msg}}
+					<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 ">
+							<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{item.ext.order.name}}</view>
+								<text
+									class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							</view>
+						</view>
+						<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+						<view class="chatfu">{{item.ext.order.fu}}</view>
 					</view>
 					</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 class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+						:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+						<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+						<view class="chatfu"
+							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
+							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
+						</view>
+						<view class="u-flex " v-for="(child,index) in item.ext.order.info.order_goods" :key="index"
+							style="margin-top: 10rpx;">
+							<image :src="child.goods_image" style="width: 152rpx;height: 152rpx;" mode="">
+							</image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{child.goods_name}}</view>
+								<text class="catmoney">¥{{child.amount}}</text>
+							</view>
+						</view>
 					</view>
 					</view>
 				</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 ">
-						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
-						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
-							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text
-								class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+
+				<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
+					<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
+						<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
+							{{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 ">
+							<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{item.ext.order.name}}</view>
+								<text
+									class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							</view>
+						</view>
+						<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+						<view class="chatfu">{{item.ext.order.fu}}</view>
+					</view>
+					<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+						:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+						<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+						<view class="chatfu"
+							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
+							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
+						</view>
+						<view class="u-flex " v-for="(child,index) in item.ext.order.info.order_goods" :key="index"
+							style="margin-top: 10rpx;">
+							<image :src="child.goods_image" style="width: 152rpx;height: 152rpx;" mode="">
+							</image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{child.goods_name}}</view>
+								<text class="catmoney">¥{{child.amount}}</text>
+							</view>
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
-					<view class="chatfu">{{item.ext.order.fu}}</view>
+					<image v-if="item.from == '13523652365'" src="/pageA/static/images/kefu.png"
+						style="width: 88rpx;height: 88rpx;" mode=""></image>
+					<image v-else-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 				</view>
 				</view>
-				<image v-if="item.from == '13523652365'" src="/pageA/static/images/kefu.png"
-					style="width: 88rpx;height: 88rpx;" mode=""></image>
-				<image v-else-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
 			</view>
-		</view>
-		<view class="" style="height: 55rpx;"></view>
-		<!-- <kj-chat></kj-chat> -->
-		<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
-			@success="getdata"></kj-chat>
+			<view class="" style="height: 55rpx;"></view>
+			<!-- <kj-chat></kj-chat> -->
+			<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
+				@success="getdatab()"></kj-chat>
+		</scroll-view>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -115,6 +153,10 @@
 				renderTime,
 				renderTime,
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
 				statusheight: '',
 				statusheight: '',
+				currentMessageId: '',
+				scrollIntoViewId: '',
+				scrollId: '',
+				cursor: ''
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
@@ -122,6 +164,7 @@
 			console.log('user', this.user);
 			console.log('user', this.user);
 			if (options.user_other) {
 			if (options.user_other) {
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
+				console.log('user_other', this.user_other);
 			}
 			}
 			// this.statusheight = uni.getSystemInfoSync().statusBarHeight,
 			// this.statusheight = uni.getSystemInfoSync().statusBarHeight,
 			this.user_other_no = options.user_other_no
 			this.user_other_no = options.user_other_no
@@ -136,6 +179,9 @@
 				// })
 				// })
 			}
 			}
 			vueBus.$on('message', this.getdata)
 			vueBus.$on('message', this.getdata)
+			if (options.id) {
+				this.scrollId = options.id
+			}
 		},
 		},
 		onShow() {
 		onShow() {
 			this.getdata()
 			this.getdata()
@@ -146,6 +192,21 @@
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
+			getdatab() {
+				this.cursor = ''
+				this.getdata()
+			},
+			scroll(id) {
+				// this.$nextTick(() => {
+				this.scrollIntoViewId = 'msg' + id;
+				// })
+			},
+			//跳转订单详情
+			toDetail(id) {
+				uni.navigateTo({
+					url: `/pageC/orderFormDetail/orderFormDetail?orderId=${id}`,
+				});
+			},
 			//逛逛
 			//逛逛
 			goshop(id) {
 			goshop(id) {
 				uni.navigateTo({
 				uni.navigateTo({
@@ -245,27 +306,45 @@
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					targetId: this.user_other_no,
 					targetId: this.user_other_no,
 					// 每页期望获取的消息条数。取值范围为 [1,50],默认值为 20。
 					// 每页期望获取的消息条数。取值范围为 [1,50],默认值为 20。
-					pageSize: this.pageSize,
+					pageSize: 50,
 					// 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串,从最新消息开始。
 					// 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串,从最新消息开始。
-					cursor: -1,
+					cursor: this.cursor,
 					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
 					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
 					chatType: "singleChat",
 					chatType: "singleChat",
 					// 消息搜索方向:(默认)`up`:按服务器收到消息的时间的逆序获取;`down`:按服务器收到消息的时间的正序获取。
 					// 消息搜索方向:(默认)`up`:按服务器收到消息的时间的逆序获取;`down`:按服务器收到消息的时间的正序获取。
 					searchDirection: "up",
 					searchDirection: "up",
 				};
 				};
 				conn.getHistoryMessages(options).then((res) => {
 				conn.getHistoryMessages(options).then((res) => {
-						console.log('res', res);
 						// 成功获取历史消息。
 						// 成功获取历史消息。
 						if (res.isLast) {
 						if (res.isLast) {
 							this.loadText = this.i18n.Nofurtherdata;
 							this.loadText = this.i18n.Nofurtherdata;
 						}
 						}
-						this.list = res.messages.reverse()
+						if (this.cursor == '') {
+							this.list = res.messages.reverse()
+						} else {
+							this.list = this.list.concat(res.messages.reverse())
+						}
+
+						if (this.scrollId != '') {
+							this.list.forEach((item) => {
+								if (item.ext.id == this.scrollId) {
+									this.scrollIntoViewId = 'msg' + this.scrollId
+								} else {
+
+								}
+
+							})
+							if (this.scrollIntoViewId == '') {
+								this.getdata()
+							}
+						}
+						this.cursor = res.cursor
 						console.log(this.list);
 						console.log(this.list);
-						this.$nextTick(() => {
-							uni.pageScrollTo({
-								scrollTop: 99999
+						if (this.scrollId == '') {
+							this.$nextTick(() => {
+								this.scrollIntoViewId = 'msg' + this.list.slice(-1)[0].ext.id
 							})
 							})
-						})
+						}
 					})
 					})
 					.catch((e) => {
 					.catch((e) => {
 						// 获取失败。
 						// 获取失败。

+ 6 - 1
pageA/chat/news.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<!-- 聊天消息 -->
 	<!-- 聊天消息 -->
 	<view class="back">
 	<view class="back">
-		<view class="input u-flex">
+		<view class="input u-flex" @click="toserve">
 			<u-icon name="search" color="rgba(153, 153, 153, 1)" size="40"></u-icon>
 			<u-icon name="search" color="rgba(153, 153, 153, 1)" size="40"></u-icon>
 			<input type="text" :placeholder="i18n.Searchchat" style="width: 600rpx;margin-left: 16rpx;" />
 			<input type="text" :placeholder="i18n.Searchchat" style="width: 600rpx;margin-left: 16rpx;" />
 		</view>
 		</view>
@@ -137,6 +137,11 @@
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
+			toserve(){
+				uni.navigateTo({
+					url:'/pageA/chat/search'
+				})
+			},
 			dele() {
 			dele() {
 				let options = {
 				let options = {
 					// 会话 ID:单聊为对方的用户 ID,群聊为群组 ID。
 					// 会话 ID:单聊为对方的用户 ID,群聊为群组 ID。

+ 259 - 0
pageA/chat/search.vue

@@ -0,0 +1,259 @@
+<template>
+	<!-- 聊天消息 -->
+	<view class="back">
+		<view class="input u-flex">
+			<u-icon name="search" color="rgba(153, 153, 153, 1)" size="40"></u-icon>
+			<input @change='search' v-model="keywords" type="text" :placeholder="i18n.Searchchat"
+				style="width: 600rpx;margin-left: 16rpx;" />
+		</view>
+		<!-- 客服 -->
+<!-- 				<view class="" v-for="(item,idx) in list" :key="idx">
+			<view v-for="(child,index) in item.easemob_log" :key="index">
+				<view v-if="user_no !='13523652365' && item.form_id == '13523652365'" class="kefu u-flex"
+					@click="tokefu">
+					<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
+					<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">{{i18n.customerService}}</view>
+							<view class="time">
+								{{new Date(Number(child.send_time)).getFullYear()}}-{{new Date(Number(child.send_time)).getMonth() + 1}}-{{new Date(Number(child.send_time)).getDate()}}
+								{{new Date(Number(child.send_time)).toTimeString().substr(0, 8)}}
+							</view>
+						</view>
+						<view class="u-flex u-row-between">
+							<text class="news">{{child.text}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<view class="box ">
+			<view style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx" >
+				<view v-for="(child,index) in item.easemob_log" :key="index" @click="chat(item,child)">
+					<view v-if="user_no !='13523652365' && item.targetId == '13523652365'" class="kefu u-flex"
+						@click="tokefu(child)">
+						<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
+						<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">{{i18n.customerService}}</view>
+								<view class="time">
+									{{new Date(Number(child.send_time)).getFullYear()}}-{{new Date(Number(child.send_time)).getMonth() + 1}}-{{new Date(Number(child.send_time)).getDate()}}
+									{{new Date(Number(child.send_time)).toTimeString().substr(0, 8)}}
+								</view>
+							</view>
+							<view class="u-flex u-row-between">
+								<text class="news">{{child.text}}</text>
+							</view>
+						</view>
+					</view>
+					<view class="u-flex " v-if="item.targetId != '13523652365'">
+						<image v-if="item.form_id == user_no" :src="item.to_merchant.image || item.to_member.avatar"
+							style="width: 88rpx;height: 88rpx;" mode=""> </image>
+						<image v-else :src="item.form_member.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.form_id == user_no">
+									{{item.to_merchant.merchant_name || item.to_member.nickname}}
+								</view>
+								<view class="name" v-else>
+									{{ item.form_member.nickname}}
+								</view>
+								<view class="time">
+									{{new Date(Number(child.send_time)).getFullYear()}}-{{new Date(Number(child.send_time)).getMonth() + 1}}-{{new Date(Number(child.send_time)).getDate()}}
+									{{new Date(Number(child.send_time)).toTimeString().substr(0, 8)}}
+								</view>
+							</view>
+							<view class="u-flex u-row-between"
+								style="border-bottom: 2rpx solid #eae7e7;padding-bottom: 26rpx;margin-top: 10rpx;">
+								<text class="news">{{child.text}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		conn,
+	} from '@/utils/WebIM';
+	export default {
+		data() {
+			return {
+				keywords: '',
+				cursor: '',
+				type: "error",
+				value: 1,
+				list: [],
+				user_no: '',
+				options1: [{
+					text: '删除',
+					style: {
+						backgroundColor: 'red',
+					}
+				}]
+			};
+		},
+		onReachBottom() {
+			// this.getlist()
+		},
+		onLoad() {
+			this.user_no = uni.getStorageSync('user_no')
+			// this.getlist()
+		},
+		onShow() {
+			// this.getlist()
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		methods: {
+			search() {
+				uni.$u.http.post('/api/easemob/list', {
+					keywords: this.keywords
+				}).then((res) => {
+					res.forEach((item)=>{
+						if(item.form_id==this.user_no){
+							item.targetId = item.to_id
+						}else{
+							item.targetId = item.form_id
+						}
+					})
+					this.list = res
+				}).catch(() => {
+
+				})
+			},
+			dele() {
+				let options = {
+					// 会话 ID:单聊为对方的用户 ID,群聊为群组 ID。
+					channel: "channel",
+					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
+					chatType: "singleChat",
+					// 删除会话时是否同时删除服务端漫游消息。
+					deleteRoam: true,
+				};
+				conn
+					.deleteConversation(options)
+					.then((res) => {
+
+					})
+					.catch((e) => {
+						// 删除失败。
+					});
+			},
+			getlist() {
+				conn.getServerConversations({
+					pageSize: 50,
+					cursor: this.cursor
+				}).then((res) => {
+					console.log(res);
+					// this.list.concat(res.data.conversations)
+					if (this.cursor == '') {
+						this.list = res.data.conversations
+					}
+					if (this.cursor) {
+						this.list.concat(res.data.conversations)
+					}
+					this.cursor = res.data.cursor
+				})
+			},
+			tokefu(item) {
+				uni.navigateTo({
+					url: '/pageA/service/service?id='+item.easemob_log_id
+				})
+			},
+			chat(item,child) {
+				if (item.form_id == this.user_no) {
+					uni.navigateTo({
+						url: '/pageA/chat/chat?user_other_no=' + item.targetId + '&user_other=' +
+							encodeURIComponent(JSON.stringify(item.to_merchant || item.to_member))+'&id='+child.easemob_log_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageA/chat/chat?user_other_no=' + item.targetId + '&user_other=' +
+							encodeURIComponent(
+								JSON.stringify(item.form_member))+'&id='+child.easemob_log_id
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.back {
+		width: 750rpx;
+		// height: 1624rpx;
+		background: #F4F4F4;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+
+		.input {
+			width: 702rpx;
+			height: 72rpx;
+			background: #FFFFFF;
+			border-radius: 36rpx;
+			padding: 0 24rpx;
+			box-sizing: border-box;
+		}
+
+		.kefu {
+			// width: 702rpx;
+			height: 156rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			// padding: 36rpx 24rpx 32rpx;
+			box-sizing: border-box;
+			margin-top: 24rpx;
+		}
+
+		.name {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #222222;
+			line-height: 44rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.time {
+			font-family: SFPro, SFPro;
+			font-weight: 400;
+			font-size: 20rpx;
+			color: #666666;
+			line-height: 24rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.news {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #666666;
+			line-height: 34rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.box {
+			width: 702rpx;
+			min-height: 1156rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 40rpx 24rpx 20rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+		}
+	}
+</style>

+ 1 - 1
pageA/confirm.vue

@@ -56,7 +56,7 @@
 		font-weight: 400;
 		font-weight: 400;
 		font-size: 24rpx;
 		font-size: 24rpx;
 		color: #222222;
 		color: #222222;
-		line-height: 34rpx;
+		line-height: 34rpx;  
 		text-align: left;
 		text-align: left;
 		font-style: normal;
 		font-style: normal;
 		margin-top: 16rpx;
 		margin-top: 16rpx;

+ 15 - 335
pageA/rule/rule.vue

@@ -1,33 +1,12 @@
 <template>
 <template>
-	<view>
-		<h2>管理规格</h2>
-		<div style="border: 1px solid #000;margin-bottom: 20px;" v-for="(spec, index) in specs" :key="index">
-			<div
-				style="display: flex;justify-content: space-between;background: #ddd;height: 40px;align-items: center;padding: 0 20px;box-sizing: border-box;">
-				<div>
-					<label :for="`spec-${index}`">规格名称: </label>
-					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
-					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
-					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
-					<input type="text" :id="`spec-${index}`" v-model="spec.name" @input="rulea" />
-				</div>
-				<div>
-					<button @click="removeSpec(index)" style="margin-right: 20px;">删除规格</button>
-					<button @click="addValue(index)">添加值</button>
-				</div>
-			</div>
-			<div style="display: flex;flex-wrap: wrap;padding: 0 20px;box-sizing: border-box;">
-				<div style="margin: 10px 0;" v-for="(value, idx) in spec.values" :key="idx">
-					<label :for="`value-${index}-${idx}`">规格值: </label>
-					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name" @input="rulea" />
-					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_en" @input="rulea" />
-					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_es" @input="rulea" />
-					<input type="text" :id="`value-${idx}`" v-model="spec.values[idx].name_ita" @input="rulea" />
-					<button style="margin:0 20px;" @click="removeValue(index,name)">删除值</button>
-				</div>
-			</div>
-		</div>
-		<button @click="addSpec">添加规格</button>
+	<view class="">
+		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: 300px;">
+			<view id="a" style="height: 700px;">A</view>
+			<view id="b" style="height: 300px;">B</view>
+			<view id="c" style="height: 300px;">C</view>
+			<!-- 更多内容 -->
+		</scroll-view>
+		<view class="" @click="scrollTo()">滚动到B</view>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -35,312 +14,13 @@
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
-				selectArr: [],
-				subIndex: [],
-				specs: [],
-				zu: [],
-				formattedItems: []
-			}
-		},
-		onLoad() {
-
-		},
-		created() {
-			this.rulea()
+				scrollIntoViewId: ''
+			};
 		},
 		},
 		methods: {
 		methods: {
-			addValue(index) {
-				// this.specs[index].values.push('');
-				this.specs[index].values.push('');
-			},
-			addSpec() {
-				this.specs.push({
-					name: '',
-					values: []
-				});
-			},
-			rulea() {
-				var all = []
-				console.log('specs', this.specs);
-				this.specs.forEach((item) => {
-					all.push(item.values)
-				})
-				this.$nextTick(() => {
-					this.zu = this.cartesianProductOf.apply(this, all)  
-					// console.log(('ruleaaaa', this.zu));
-					if (this.zu) {
-						this.formatItems();
-					}
-				})
-			},
-			removeValue(specIndex, valueIndex) {
-				console.log('specIndex', specIndex);
-				console.log('valueIndex', valueIndex);
-				this.specs[specIndex].values.splice(valueIndex, 1);
-				this.rulea()
-			},
-			// 多规格组合
-			cartesianProductOf() { //笛卡尔积
-				return Array.prototype.reduce.call(arguments, (a, b) => {
-					var ret = [];
-					a.forEach((item) => {
-						b.forEach((child) => {
-							// var c = item.concat([child.name])
-							// console.log(c);
-							// ret.push({item:c});
-							ret.push(item.concat([child]))
-						});
-					});
-					console.log('ret', ret);
-					return ret;
-				}, [
-					[]
-				]);
-			},
-			formatItems() {
-				// 遍历原始数组并转换格式
-				var obj = {}
-				this.formattedItems.map(item => {})
-				console.log('this.formattedItems', this.formattedItems);
-				let formlist = (JSON.parse(JSON.stringify(this.formattedItems)))
-				this.formattedItems = []
-				let resultList = []
-				this.zu.forEach((item, index) => {
-					if (this.zu) {
-						let newlist = []
-						newlist.push({
-							height: item.height,
-							stock_total: item.stock_total,
-							weight: item.weight,
-							length: item.length,
-							width: item.width,
-							price: item.price,
-							image: item.image,
-							is_sales: item.is_sales
-						})
-						let itemV0 = []
-						let itemV1 = []
-						let itemV2 = []
-						let itemV3 = []
-						// resultList.push(itemV)
-						item.forEach((itemC, indexC) => {
-							itemV0.push(itemC.name)
-							itemV1.push(itemC.name_en)
-							itemV2.push(itemC.name_es)
-							itemV3.push(itemC.name_ita)
-						})
-						console.log('itemV1', itemV0);
-						console.log('itemV2', itemV1);
-						console.log('itemV3', itemV2);
-						console.log('itemV4', itemV3);
-
-						this.formattedItems.push({
-							item: itemV0.join(","),
-							item_en: itemV1.join(","),
-							item_es: itemV2.join(","),
-							item_ita: itemV3.join(","),
-							// ...newlist[index]
-							height: '0', // 假设高度为20
-							stock_total: '0', // 库存
-							weight: '0', // 重量
-							length: '0', // 长度
-							width: '0', // 宽度
-							price: '0.00', // 价格
-							image: '', // 图片
-							is_sales: true, // 是否售卖
-						});
-					} else {
-						this.formattedItems = []
-					}
-
-
-
-				});
-
-				// this.formattedItems = newlist.concat(this.formattedItems)
-				console.log('formlist', formlist);
-				console.log('formattedItems', this.formattedItems);
-				this.formattedItems.forEach((item, index) => {
-					formlist.forEach((child, indexC) => {
-						if (formlist.length == this.formattedItems.length) {
-							if (index == indexC) {
-								item.stock_total = child.stock_total // 库存
-								item.height = child.height // 假设高度为20
-								item.weight = child.weight // 重量
-								item.weight = child.weight // 长度
-								item.width = child.width // 宽度
-								item.price = child.price // 价格
-								item.image = child.image // 图片
-								item.is_sales = child.is_sales // 是否售卖
-							}
-						} else {
-							if (item.item == child.item) {
-								item.height = child.height // 假设高度为20
-								item.stock_total = child.stock_total // 库存
-								item.weight = child.weight // 重量
-								item.weight = child.weight // 长度
-								item.width = child.width // 宽度
-								item.price = child.price // 价格
-								item.image = child.image // 图片
-								item.is_sales = child.is_sales // 是否售卖
-							}
-						}
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.avatar {
-		width: 60%;
-		float: left;
-	}
-
-	.avatar-uploader .el-upload {
-		border: 1px dashed #d9d9d9;
-		border-radius: 6px;
-		cursor: pointer;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.avatar-uploader .el-upload:hover {
-		border-color: #409EFF;
-	}
-
-	.avatar-uploader-icon {
-		font-size: 28px;
-		color: #8c939d;
-		width: 178px;
-		height: 178px;
-		line-height: 178px;
-		text-align: center;
-	}
-
-	.avatara {
-		width: 178px;
-		height: 178px;
-		display: block;
-	}
-
-	.wp-80 {
-		width: 80%;
-	}
-
-	.wp-47 {
-		width: 47%;
-	}
-
-	.mg-auto {
-		margin: 0 auto;
-	}
-
-	.pd-25 {
-		padding: 25rpx;
-	}
-
-	.pd-b-20 {
-		padding: 0 0 20rpx;
-	}
-
-	.pd-tb-40 {
-		padding: 40rpx 0;
-	}
-
-	.bg-fff {
-		background-color: #FFFFFF;
-	}
-
-	.radius5 {
-		border-radius: 5rpx;
-	}
-
-	.radius50 {
-		border-radius: 50rpx;
-	}
-
-	.flex-wrap {
-		flex-wrap: wrap;
-	}
-
-	.fss {
-		display: flex;
-		justify-content: flex-start;
-		align-items: flex-start;
-	}
-
-	.fbc {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.fcc {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.safe_area {
-		margin-bottom: constant(safe-area-inset-bottom);
-		margin-bottom: env(safe-area-inset-bottom);
-	}
-
-	.dra_position {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		width: 100%;
-		height: auto;
-	}
-
-	.scroll-view-box {
-		font-size: 28rpx;
-		bottom: 84rpx;
-	}
-
-	.dra_close {
-		box-sizing: border-box;
-		position: absolute;
-		bottom: 0;
-		width: 100%;
-		padding: 15rpx 30rpx 20rpx;
-
-		>view {
-			height: 68rpx;
-			line-height: 68rpx;
-			text-align: center;
-		}
-
-		.btns {
-			color: #a12a30;
-			border: 1px solid #a12a30;
-		}
-
-		.btns1 {
-			color: #FFFFFF;
-			background-color: #a12a30;
-		}
-	}
-
-	.scroll-view-div {
-		>view:nth-child(3n-1) {
-			margin: 0 10rpx;
-		}
-
-		>view {
-			width: 32%;
-			height: 72rpx;
-			margin-bottom: 16rpx;
-			text-align: center;
-			background-color: #F5F5F5;
-		}
-
-		.active {
-			color: #ff000b;
-			background-color: #fff4f3;
+			scrollTo() {
+				this.scrollIntoViewId = 'b';
+			}
 		}
 		}
-	}
-</style>
+	};
+</script>

+ 112 - 80
pageA/service/service.vue

@@ -1,5 +1,6 @@
 <template>
 <template>
 	<view class="chat-pages">
 	<view class="chat-pages">
+
 		<u-navbar :title="i18n.customerService" :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">
 			<view class="u-nav-slot u-flex" slot="left">
 				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
 				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
@@ -9,46 +10,46 @@
 		</u-navbar>
 		</u-navbar>
 
 
 		<view class="" style="height: 60rpx;"></view>
 		<view class="" style="height: 60rpx;"></view>
-
-		<view class="chat-item" v-for="(item,index) in list" :key="index">
-			<view class="chat-time">
-				{{renderTime(item.time)}}
-			</view>
-			<view class="chat-item-box u-flex u-col-top acenter" v-if="item.from == user_other_no">
-				<!-- <image :src="user_other.avatar" class="user-img" mode=""></image> -->
-				<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
-				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
-					<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
-						{{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;" />
+		<scroll-view scroll-y="true" :scroll-into-view="scrollIntoViewId" style="height: calc(100vh - 160rpx);overflow: hidden;">
+			<view :id="'msg'+ item.ext.id" class="chat-item" v-for="(item,index) in list" :key="index">
+				<view class="chat-time">
+					{{renderTime(item.time)}}
 				</view>
 				</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 class="chat-item-box u-flex u-col-top acenter" v-if="item.from == user_other_no">
+					<!-- <image :src="user_other.avatar" class="user-img" mode=""></image> -->
+					<image src="/pageA/static/images/kefu.png" style="width: 88rpx;height: 88rpx;" mode=""></image>
+					<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
+						<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
+							{{item.msg}}
+						</view>
 					</view>
 					</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 ">
-						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
-						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
-							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text
-								class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+					<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>
 					</view>
-					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
-					<view class="chatfu">{{item.ext.order.fu}}</view>
-				</view>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
-					<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+					<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 ">
+							<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{item.ext.order.name}}</view>
+								<text
+									class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							</view>
+						</view>
+						<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+						<view class="chatfu">{{item.ext.order.fu}}</view>
+					</view>
+					<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+						:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+						<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
 						<view class="chatfu"
 						<view class="chatfu"
 							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
 							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
 							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
 							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
@@ -62,30 +63,30 @@
 								<text class="catmoney">¥{{child.amount}}</text>
 								<text class="catmoney">¥{{child.amount}}</text>
 							</view>
 							</view>
 						</view>
 						</view>
-				</view>
-			</view>
-			<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
-				<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
-					<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
-						{{item.msg}}
 					</view>
 					</view>
 				</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 ">
-						<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
-						<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
-							<view class="chattitle">{{item.ext.order.name}}</view>
-							<text
-								class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+				<view class="chat-item-box u-flex u-col-top jend" v-if="item.from == user_no">
+					<view style="max-width: 80%;" class="" v-if="item.type == 'txt' && !item.ext.type">
+						<view class="chat-text" :style="{background:item.from == user_no ? '#D3E5FB' : '#fff'}">
+							{{item.msg}}
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
-					<view class="chatfu">{{item.ext.order.fu}}</view>
-				</view>
-				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
-					:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
-					<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
+					<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 ">
+							<image :src="item.ext.order.image" style="width: 152rpx;height: 152rpx;" mode=""></image>
+							<view class="u-flex-column u-row-between" style="margin-left: 20rpx;height: 152rpx;">
+								<view class="chattitle">{{item.ext.order.name}}</view>
+								<text
+									class="catmoney">¥{{item.ext.order.discount_price || item.ext.order.discount_price}}</text>
+							</view>
+						</view>
+						<view class="" style="border: 2rpx solid #979797;opacity: 0.1;margin: 24rpx 0;"></view>
+						<view class="chatfu">{{item.ext.order.fu}}</view>
+					</view>
+					<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'orderinfo'"
+						:style="{top:(statusheight + 58) + 'px'}" @click="toDetail(item.ext.order.info.order.id)">
+						<!-- <view v-for="(item,idx) in orderList" :key="idx"> -->
 						<view class="chatfu"
 						<view class="chatfu"
 							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
 							style="height: 50rpx;display: flex;justify-content: space-between;align-items: center;">
 							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
 							<view class="">订单编号:{{item.ext.order.info.order.order_no}}</view>
@@ -99,14 +100,15 @@
 								<text class="catmoney">¥{{child.amount}}</text>
 								<text class="catmoney">¥{{child.amount}}</text>
 							</view>
 							</view>
 						</view>
 						</view>
+					</view>
+					<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 				</view>
 				</view>
-				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
 			</view>
 			</view>
-		</view>
-		<view class="" style="height: 55rpx;"></view>
-		<!-- <kj-chat></kj-chat> -->
-		<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
-			@success="getdata"></kj-chat>
+			<view class="" style="height: 55rpx;"></view>
+			<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other'
+				@success="getdatab()"></kj-chat>
+			<!-- <kj-chat></kj-chat> -->
+		</scroll-view>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -133,11 +135,15 @@
 				renderTime,
 				renderTime,
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
 				statusheight: '',
 				statusheight: '',
+				currentMessageId: '',
+				scrollIntoViewId: '',
+				scrollId: '',
+				cursor: ''
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
 			this.user = uni.getStorageSync('user_info')
 			this.user = uni.getStorageSync('user_info')
-			console.log('user', this.user);
+			console.log('options', options);
 			if (options.user_other) {
 			if (options.user_other) {
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 			}
 			}
@@ -145,13 +151,11 @@
 			// this.user_other = options.user_other, //用户信息
 			// this.user_other = options.user_other, //用户信息
 			if (uni.getStorageSync('user_no')) {
 			if (uni.getStorageSync('user_no')) {
 				this.user_no = uni.getStorageSync('user_no')
 				this.user_no = uni.getStorageSync('user_no')
-			} else {
-				// index().then((res) => {
-
-
-				// })
-			}
+			} else {}
 			vueBus.$on('message', this.getdata)
 			vueBus.$on('message', this.getdata)
+			if (options.id) {
+				this.scrollId = options.id
+			}
 		},
 		},
 		onShow() {
 		onShow() {
 			this.getdata()
 			this.getdata()
@@ -162,11 +166,21 @@
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
+			getdatab() {
+				this.cursor = ''
+				this.getdata()
+			},
+			scroll(id) {
+				// this.$nextTick(() => {
+				this.scrollIntoViewId = 'msg' + id;
+				console.log(this.scrollIntoViewId);
+				// })
+			},
 			//跳转订单详情
 			//跳转订单详情
 			toDetail(id) {
 			toDetail(id) {
-			  uni.navigateTo({
-			    url: `/pageC/orderFormDetail/orderFormDetail?orderId=${id}`,
-			  });
+				uni.navigateTo({
+					url: `/pageC/orderFormDetail/orderFormDetail?orderId=${id}`,
+				});
 			},
 			},
 			callphone() {
 			callphone() {
 				uni.$u.http.get('/api/config', {
 				uni.$u.http.get('/api/config', {
@@ -261,27 +275,45 @@
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
 					targetId: this.user_other_no,
 					targetId: this.user_other_no,
 					// 每页期望获取的消息条数。取值范围为 [1,50],默认值为 20。
 					// 每页期望获取的消息条数。取值范围为 [1,50],默认值为 20。
-					pageSize: this.pageSize,
+					pageSize: 50,
 					// 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串,从最新消息开始。
 					// 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串,从最新消息开始。
-					cursor: -1,
+					cursor: this.cursor,
 					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
 					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
 					chatType: "singleChat",
 					chatType: "singleChat",
 					// 消息搜索方向:(默认)`up`:按服务器收到消息的时间的逆序获取;`down`:按服务器收到消息的时间的正序获取。
 					// 消息搜索方向:(默认)`up`:按服务器收到消息的时间的逆序获取;`down`:按服务器收到消息的时间的正序获取。
 					searchDirection: "up",
 					searchDirection: "up",
 				};
 				};
 				conn.getHistoryMessages(options).then((res) => {
 				conn.getHistoryMessages(options).then((res) => {
-						console.log('res', res);
+						console.log(1111111111);
 						// 成功获取历史消息。
 						// 成功获取历史消息。
 						if (res.isLast) {
 						if (res.isLast) {
 							this.loadText = this.i18n.Nofurtherdata;
 							this.loadText = this.i18n.Nofurtherdata;
 						}
 						}
+						// if (this.cursor == '') {
 						this.list = res.messages.reverse()
 						this.list = res.messages.reverse()
-						console.log(this.list);
-						this.$nextTick(() => {
-							uni.pageScrollTo({
-								scrollTop: 99999
+						// } else {
+						// 	this.list = this.list.concat(res.messages.reverse())
+						// }
+						if (this.scrollId != '') {
+							this.list.forEach((item) => {
+								if (item.ext.id == this.scrollId) {
+									this.scrollIntoViewId = 'msg' + this.scrollId
+								} else {
+
+								}
+
 							})
 							})
-						})
+							if (this.scrollIntoViewId == '') {
+								this.getdata()
+							}
+						}
+						this.cursor = res.cursor
+						if (this.scrollId == '') {
+							setTimeout(() => {
+								this.scrollIntoViewId = 'msg' + this.list.slice(-1)[0].ext.id
+							},800)
+						}
+						console.log(this.list);
 					})
 					})
 					.catch((e) => {
 					.catch((e) => {
 						// 获取失败。
 						// 获取失败。

+ 692 - 691
pages.json

@@ -1,697 +1,698 @@
 {
 {
-  "easycom": {
-    "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
-    "^gf-(.*)": "@/components/kj-$1/kj-$1.vue"
-  },
-  "pages": [
-    //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "商城",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/mine/mine",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/shopping/shopping",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/cart/cart",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/login/login",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "mp_ecard_sdk/index/index",
-      "style": {
-        "navigationBarTitleText": "腾讯云E证通授权"
-      }
-    }
+	"easycom": {
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
+		"^gf-(.*)": "@/components/kj-$1/kj-$1.vue"
+	},
+	"pages": [
+		//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "商城",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/mine/mine",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shopping/shopping",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "mp_ecard_sdk/index/index",
+			"style": {
+				"navigationBarTitleText": "腾讯云E证通授权"
+			}
+		}
 
 
-  ],
-  "subPackages": [
-    {
-      "root": "pageA",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "productdetails",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "order",
-          "style": {
-            "navigationBarTitleText": "填写订单",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "balance",
-          "style": {
-            "navigationBarTitleText": "支付订单",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "counter",
-          "style": {
-            "navigationBarTitleText": "物流报价计算器",
-            "enablePullDownRefresh": false,
-            "navigationBarTitleFontSize": 20
-          }
-        },
-        {
-          "path": "logisticsinfo",
-          "style": {
-            "navigationBarTitleText": "物流详情",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "subsidy",
-          "style": {
-            "navigationBarTitleText": "百万补贴",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "chat/chat",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "chat/news",
-          "style": {
-            "navigationBarTitleText": "消息",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "service/service",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "payorder",
-          "style": {
-            "navigationBarTitleText": "支付订单",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "confirm",
-          "style": {
-            "navigationBarTitleText": "支付结果",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "shoptype",
-          "style": {
-            "navigationBarTitleText": "商品分类",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "shoplist",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "rule/rule",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "comment",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "changelange",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pageB",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "parcel",
-          "style": {
-            "navigationBarTitleText": "添加包裹",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "delivery",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "goods",
-          "style": {
-            "navigationBarTitleText": "物品信息",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "Senderinfor",
-          "style": {
-            "navigationBarTitleText": "填写寄件人信息",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "recipientinfo",
-          "style": {
-            "navigationBarTitleText": "填写收件人信息",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "citychange",
-          "style": {
-            "navigationBarTitleText": "选择国家",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "list/list",
-          "style": {
-            "navigationBarTitleText": "拼包列表",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "ParcelExpress",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "account",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "myPackage",
-          "style": {
-            "navigationBarTitleText": "我的包裹",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "end",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "expresstype",
-          "style": {
-            "navigationBarTitleText": "快递服务",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "orderinfo",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "search",
-          "style": {
-            "navigationBarTitleText": "物品信息",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "xieyi",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        }
-      ]
-    },
-    {
-      "root": "pageC",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "accountBalance/accountBalance",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "账户余额",
-            "backgroundColor": "#f4f4f4",
-            "app-plus": {
-              "background": "#f4f4f4"
-            }
-          }
-        },
-        {
-          "path": "balanceDetail/balanceDetail",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "余额明细",
+	],
+	"subPackages": [{
+			"root": "pageA",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "productdetails",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order",
+					"style": {
+						"navigationBarTitleText": "填写订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "balance",
+					"style": {
+						"navigationBarTitleText": "支付订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "counter",
+					"style": {
+						"navigationBarTitleText": "物流报价计算器",
+						"enablePullDownRefresh": false,
+						"navigationBarTitleFontSize": 20
+					}
+				},
+				{
+					"path": "logisticsinfo",
+					"style": {
+						"navigationBarTitleText": "物流详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "subsidy",
+					"style": {
+						"navigationBarTitleText": "百万补贴",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "chat/chat",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "chat/news",
+					"style": {
+						"navigationBarTitleText": "消息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "chat/search",  
+					"style": {
+						"navigationBarTitleText": "消息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "service/service",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "payorder",
+					"style": {
+						"navigationBarTitleText": "支付订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "confirm",
+					"style": {
+						"navigationBarTitleText": "支付结果",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shoptype",
+					"style": {
+						"navigationBarTitleText": "商品分类",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "shoplist",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "rule/rule",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "comment",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "changelange",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "pageB",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "parcel",
+					"style": {
+						"navigationBarTitleText": "添加包裹",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "delivery",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods",
+					"style": {
+						"navigationBarTitleText": "物品信息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "Senderinfor",
+					"style": {
+						"navigationBarTitleText": "填写寄件人信息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "recipientinfo",
+					"style": {
+						"navigationBarTitleText": "填写收件人信息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "citychange",
+					"style": {
+						"navigationBarTitleText": "选择国家",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "list/list",
+					"style": {
+						"navigationBarTitleText": "拼包列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "ParcelExpress",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "account",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "myPackage",
+					"style": {
+						"navigationBarTitleText": "我的包裹",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "end",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "expresstype",
+					"style": {
+						"navigationBarTitleText": "快递服务",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "orderinfo",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "search",
+					"style": {
+						"navigationBarTitleText": "物品信息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "xieyi",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		},
+		{
+			"root": "pageC",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "accountBalance/accountBalance",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "账户余额",
+						"backgroundColor": "#f4f4f4",
+						"app-plus": {
+							"background": "#f4f4f4"
+						}
+					}
+				},
+				{
+					"path": "balanceDetail/balanceDetail",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "余额明细",
 
 
-            "backgroundColor": "#ffffff",
-            "app-plus": {
-              "background": "#ffffff"
-            }
-          }
-        },
-        {
-          "path": "recharge/recharge",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "withdrawal/withdrawal",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "余额提现"
-          }
-        },
-        {
-          "path": "withdrawalDetail/withdrawalDetail",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "提现明细",
-            "enablePullDownRefresh": false,
-            "backgroundColor": "#ffffff"
-          }
-        },
-        {
-          "path": "ensureMoney/ensureMoney",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "ensureExplain/ensureExplain",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "mineFollow/mineFollow",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "",
+						"backgroundColor": "#ffffff",
+						"app-plus": {
+							"background": "#ffffff"
+						}
+					}
+				},
+				{
+					"path": "recharge/recharge",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "withdrawal/withdrawal",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "余额提现"
+					}
+				},
+				{
+					"path": "withdrawalDetail/withdrawalDetail",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "提现明细",
+						"enablePullDownRefresh": false,
+						"backgroundColor": "#ffffff"
+					}
+				},
+				{
+					"path": "ensureMoney/ensureMoney",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "ensureExplain/ensureExplain",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "mineFollow/mineFollow",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "",
 
 
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "accountSetup/accountSetup",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "账号设置"
-          }
-        },
-        {
-          "path": "switchLanguage/switchLanguage",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "切换语言"
-          }
-        },
-        {
-          "path": "personalInformation/personalInformation",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "个人信息"
-          }
-        },
-        {
-          "path": "editName/editName",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "addressManagement/addressManagement",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "addEditAddress/addEditAddress",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "orderForm/orderForm",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "internationalAddress/internationalAddress",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "accountSecurity/accountSecurity",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "accountCancellation/accountCancellation",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "privacyPolicy/privacyPolicy",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "orderFormDetail/orderFormDetail",
-          "enablePullDownRefresh": false,
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationBarBackgroundColor": "#f4f4f4"
-          }
-        },
-        {
-          "path": "myPackage/myPackage",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "applicationRefund/applicationRefund",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "refundDetail/refundDetail",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    },
-    {
-      "root": "pageD",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "supplyChainGoods/supplyChainGoods",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "productDetails/productDetails",
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "commodityManage/commodityManage",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "platformProducts/platformProducts",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "settleIn/settleIn",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "orderFormManage/orderFormManage",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "orderInformation/orderInformation",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "logisticsProgress/logisticsProgress",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "paymentOrder/paymentOrder",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "afterSalesManage/afterSalesManage",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "afterSalesDetail/afterSalesDetail",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "sending/sending",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "deliverGoods/deliverGoods",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "evaluate/evaluate",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "homepage/homepage",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "ensureRecharge/ensureRecharge",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "orderDetail/orderDetail",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "resultFeedback/resultFeedback",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "userAgreement/userAgreement",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "joinPlatfrom/joinPlatfrom",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "newBulitOrder/newBulitOrder",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        },
-        {
-          "path": "faceIdentify/faceIdentify",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "跨境电商",
-    "navigationBarBackgroundColor": "#fff",
-    "backgroundColor": "#222"
-  },
-  "uniIdRouter": {},
-  "tabBar": {
-    "color": "#222",
-    "selectedColor": "#F83224",
-    // "list": [
-    // 	{
-    // 		"iconPath": "static/express1.png",
-    // 		"selectedIconPath": "static/express2.png",
-    // 		"text": "跨境速递",
-    // 		"pagePath": "pages/express/express"
-    // 	},
-    // 	{
-    // 		"iconPath": "static/index1.png",
-    // 		"selectedIconPath": "static/index2.png",
-    // 		"text": "商城",
-    // 		"pagePath": "pages/index/index"
-    // 	},
-    // 	{
-    // 		"iconPath": "static/shop.png",
-    // 		"selectedIconPath": "static/shop.png",
-    // 		"text": "购",
-    // 		"pagePath": "pages/shopping/shopping"
-    // 	},
-    // 	{
-    // 		"iconPath": "static/cart1.png",
-    // 		"selectedIconPath": "static/cart2.png",
-    // 		"text": "购物车",
-    // 		"pagePath": "pages/cart/cart"
-    // 	},
-    // 	{
-    // 		"iconPath": "static/mine1.png",
-    // 		"selectedIconPath": "static/mine2.png",
-    // 		"text": "我的",
-    // 		"pagePath": "pages/mine/mine"
-    // 	}
-    // ]
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "accountSetup/accountSetup",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "账号设置"
+					}
+				},
+				{
+					"path": "switchLanguage/switchLanguage",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "切换语言"
+					}
+				},
+				{
+					"path": "personalInformation/personalInformation",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "个人信息"
+					}
+				},
+				{
+					"path": "editName/editName",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "addressManagement/addressManagement",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "addEditAddress/addEditAddress",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "orderForm/orderForm",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "internationalAddress/internationalAddress",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "accountSecurity/accountSecurity",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "accountCancellation/accountCancellation",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "privacyPolicy/privacyPolicy",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "orderFormDetail/orderFormDetail",
+					"enablePullDownRefresh": false,
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#f4f4f4"
+					}
+				},
+				{
+					"path": "myPackage/myPackage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "applicationRefund/applicationRefund",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "refundDetail/refundDetail",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pageD",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "supplyChainGoods/supplyChainGoods",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "productDetails/productDetails",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "commodityManage/commodityManage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "platformProducts/platformProducts",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "settleIn/settleIn",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "orderFormManage/orderFormManage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "orderInformation/orderInformation",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "logisticsProgress/logisticsProgress",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "paymentOrder/paymentOrder",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "afterSalesManage/afterSalesManage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "afterSalesDetail/afterSalesDetail",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "sending/sending",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "deliverGoods/deliverGoods",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "evaluate/evaluate",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "homepage/homepage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "ensureRecharge/ensureRecharge",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "orderDetail/orderDetail",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "resultFeedback/resultFeedback",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "userAgreement/userAgreement",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "joinPlatfrom/joinPlatfrom",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "newBulitOrder/newBulitOrder",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "faceIdentify/faceIdentify",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "跨境电商",
+		"navigationBarBackgroundColor": "#fff",
+		"backgroundColor": "#222"
+	},
+	"uniIdRouter": {},
+	"tabBar": {
+		"color": "#222",
+		"selectedColor": "#F83224",
+		// "list": [
+		// 	{
+		// 		"iconPath": "static/express1.png",
+		// 		"selectedIconPath": "static/express2.png",
+		// 		"text": "跨境速递",
+		// 		"pagePath": "pages/express/express"
+		// 	},
+		// 	{
+		// 		"iconPath": "static/index1.png",
+		// 		"selectedIconPath": "static/index2.png",
+		// 		"text": "商城",
+		// 		"pagePath": "pages/index/index"
+		// 	},
+		// 	{
+		// 		"iconPath": "static/shop.png",
+		// 		"selectedIconPath": "static/shop.png",
+		// 		"text": "购",
+		// 		"pagePath": "pages/shopping/shopping"
+		// 	},
+		// 	{
+		// 		"iconPath": "static/cart1.png",
+		// 		"selectedIconPath": "static/cart2.png",
+		// 		"text": "购物车",
+		// 		"pagePath": "pages/cart/cart"
+		// 	},
+		// 	{
+		// 		"iconPath": "static/mine1.png",
+		// 		"selectedIconPath": "static/mine2.png",
+		// 		"text": "我的",
+		// 		"pagePath": "pages/mine/mine"
+		// 	}
+		// ]
 
 
-    "custom": true,
+		"custom": true,
 
 
-    "list": [
-      {
-        "pagePath": "pages/index/index"
-      },
-      {
-        "pagePath": "pages/shopping/shopping"
-      },
-      {
-        "pagePath": "pages/cart/cart"
-      },
-      {
-        "pagePath": "pages/mine/mine"
-      }
-    ]
-  }
-}
+		"list": [{
+				"pagePath": "pages/index/index"
+			},
+			{
+				"pagePath": "pages/shopping/shopping"
+			},
+			{
+				"pagePath": "pages/cart/cart"
+			},
+			{
+				"pagePath": "pages/mine/mine"
+			}
+		]
+	}
+}

BIN
static/imagess/more5.png


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


+ 3 - 1
unpackage/dist/build/mp-weixin/components/kj-chat/kj-chat.json

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

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


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


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


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


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


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


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


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


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


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{5393:function(n,e,t){"use strict";t.r(e);var u=t("9134"),o=t("9ee6");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("fb8b");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7709bcd4",null,!1,u["a"],a);e["default"]=f.exports},9134:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},"9ee6":function(n,e,t){"use strict";t.r(e);var u=t("cf3f0"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},b34d:function(n,e,t){},cf3f0:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(n){n||(this.value2="")}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{value2:""}},methods:{close:function(){}}};e.default=u},fb8b:function(n,e,t){"use strict";var u=t("b34d"),o=t.n(u);o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {
     {

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


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


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


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

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

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

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

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

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

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

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

BIN
unpackage/dist/build/mp-weixin/static/imagess/more5.png


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


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


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


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


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


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


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


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


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


+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/search.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":"wIAAA,MAGA,aACA,aAFAA,EAAGC,kCAAoCC,EAGvCC,EAAWC,a","file":"pageA/search.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pageA/search.vue'\ncreatePage(Page)"],"sourceRoot":""}

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


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


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


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


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

@@ -20,6 +20,7 @@
         "subsidy",
         "subsidy",
         "chat/chat",
         "chat/chat",
         "chat/news",
         "chat/news",
+        "chat/search",
         "service/service",
         "service/service",
         "payorder",
         "payorder",
         "confirm",
         "confirm",

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


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


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


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


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


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


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


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


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


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


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


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


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


+ 7 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/search.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "消息",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

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


+ 84 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/search.wxss

@@ -0,0 +1,84 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.back {
+  width: 750rpx;
+  background: #F4F4F4;
+  padding: 20rpx 24rpx;
+  box-sizing: border-box;
+}
+.back .input {
+  width: 702rpx;
+  height: 72rpx;
+  background: #FFFFFF;
+  border-radius: 36rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+}
+.back .kefu {
+  height: 156rpx;
+  background: #FFFFFF;
+  border-radius: 16rpx;
+  box-sizing: border-box;
+  margin-top: 24rpx;
+}
+.back .name {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 32rpx;
+  color: #222222;
+  line-height: 44rpx;
+  text-align: left;
+  font-style: normal;
+}
+.back .time {
+  font-family: SFPro, SFPro;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #666666;
+  line-height: 24rpx;
+  text-align: left;
+  font-style: normal;
+}
+.back .news {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #666666;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
+.back .box {
+  width: 702rpx;
+  min-height: 1156rpx;
+  background: #FFFFFF;
+  border-radius: 16rpx;
+  padding: 40rpx 24rpx 20rpx;
+  box-sizing: border-box;
+  margin-top: 20rpx;
+}
+

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


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


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


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


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


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


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


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


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


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


+ 0 - 148
unpackage/dist/dev/mp-weixin/pageA/rule/rule.wxss

@@ -1,148 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.avatar {
-  width: 60%;
-  float: left;
-}
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatara {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-.wp-80 {
-  width: 80%;
-}
-.wp-47 {
-  width: 47%;
-}
-.mg-auto {
-  margin: 0 auto;
-}
-.pd-25 {
-  padding: 25rpx;
-}
-.pd-b-20 {
-  padding: 0 0 20rpx;
-}
-.pd-tb-40 {
-  padding: 40rpx 0;
-}
-.bg-fff {
-  background-color: #FFFFFF;
-}
-.radius5 {
-  border-radius: 5rpx;
-}
-.radius50 {
-  border-radius: 50rpx;
-}
-.flex-wrap {
-  flex-wrap: wrap;
-}
-.fss {
-  display: flex;
-  justify-content: flex-start;
-  align-items: flex-start;
-}
-.fbc {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.fcc {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.safe_area {
-  margin-bottom: constant(safe-area-inset-bottom);
-  margin-bottom: env(safe-area-inset-bottom);
-}
-.dra_position {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: auto;
-}
-.scroll-view-box {
-  font-size: 28rpx;
-  bottom: 84rpx;
-}
-.dra_close {
-  box-sizing: border-box;
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  padding: 15rpx 30rpx 20rpx;
-}
-.dra_close > view {
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-}
-.dra_close .btns {
-  color: #a12a30;
-  border: 1px solid #a12a30;
-}
-.dra_close .btns1 {
-  color: #FFFFFF;
-  background-color: #a12a30;
-}
-.scroll-view-div > view:nth-child(3n-1) {
-  margin: 0 10rpx;
-}
-.scroll-view-div > view {
-  width: 32%;
-  height: 72rpx;
-  margin-bottom: 16rpx;
-  text-align: center;
-  background-color: #F5F5F5;
-}
-.scroll-view-div .active {
-  color: #ff000b;
-  background-color: #fff4f3;
-}
-

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


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


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


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


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


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


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


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


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


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


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


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


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


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

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{360:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(361));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},361:function(n,e,t){"use strict";t.r(e);var r=t(362),u=t(364);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageB/index.vue",e["default"]=a.exports},362:function(n,e,t){"use strict";t.r(e);var r=t(363);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},363:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},364:function(n,e,t){"use strict";t.r(e);var r=t(365),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},365:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[360,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{366:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(367));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},367:function(n,e,t){"use strict";t.r(e);var r=t(368),u=t(370);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageB/index.vue",e["default"]=a.exports},368:function(n,e,t){"use strict";t.r(e);var r=t(369);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},369:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},370:function(n,e,t){"use strict";t.r(e);var r=t(371),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},371:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[366,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

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


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


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


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


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


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


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


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


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


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


+ 2 - 2
unpackage/dist/dev/mp-weixin/pageC/accountSecurity/component/textRight.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1196:function(n,t,e){"use strict";e.r(t);var r=e(1197),u=e(1199);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1201);var o,i=e(45),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"eaeef97c",null,!1,r["components"],o);a.options.__file="pageC/accountSecurity/component/textRight.vue",t["default"]=a.exports},1197:function(n,t,e){"use strict";e.r(t);var r=e(1198);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},1198:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return o})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1199:function(n,t,e){"use strict";e.r(t);var r=e(1200),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1200:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={data:function(){return{}},props:{texts:{typeof:String,default:""}}};t.default=r},1201:function(n,t,e){"use strict";e.r(t);var r=e(1202),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1202:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1202:function(n,t,e){"use strict";e.r(t);var r=e(1203),u=e(1205);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1207);var o,i=e(45),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"eaeef97c",null,!1,r["components"],o);a.options.__file="pageC/accountSecurity/component/textRight.vue",t["default"]=a.exports},1203:function(n,t,e){"use strict";e.r(t);var r=e(1204);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},1204:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return o})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1205:function(n,t,e){"use strict";e.r(t);var r=e(1206),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1206:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={data:function(){return{}},props:{texts:{typeof:String,default:""}}};t.default=r},1207:function(n,t,e){"use strict";e.r(t);var r=e(1208),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1208:function(n,t,e){}}]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/accountSecurity/component/textRight.js.map
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/accountSecurity/component/textRight.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/accountSecurity/component/textRight-create-component',
     'pageC/accountSecurity/component/textRight-create-component',
     {
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(1196))
+            __webpack_require__('2')['createComponent'](__webpack_require__(1202))
         })
         })
     },
     },
     [['pageC/accountSecurity/component/textRight-create-component']]
     [['pageC/accountSecurity/component/textRight-create-component']]

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


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


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


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