zhaogongxue 7 月之前
父節點
當前提交
0efda26513
共有 100 個文件被更改,包括 730 次插入181 次删除
  1. 1 0
      App.vue
  2. 8 4
      components/kj-chat/kj-chat.vue
  3. 31 27
      components/kj-tabbar/kj-tabbar.vue
  4. 5 3
      pageA/chat/chat.vue
  5. 27 9
      pageA/chat/news.vue
  6. 1 1
      pageA/comment.vue
  7. 9 2
      pageA/productdetails.vue
  8. 561 16
      pageA/service/service.vue
  9. 1 1
      pageB/ParcelExpress.vue
  10. 1 1
      pageB/delivery.vue
  11. 9 4
      pageB/xieyi.vue
  12. 4 0
      pages/cart/cart.vue
  13. 2 2
      pages/express/express.vue
  14. 8 6
      pages/index/index.vue
  15. 34 18
      pages/login/login.vue
  16. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/chat.js
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/chat/news.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.js
  20. 1 1
      unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.wxml
  21. 1 1
      unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.wxss
  22. 1 1
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.js
  23. 1 1
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxml
  24. 1 1
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxss
  25. 1 1
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.js
  26. 0 0
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.wxml
  27. 0 0
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.wxss
  28. 0 0
      unpackage/dist/build/mp-weixin/pages/login/login.js
  29. 0 0
      unpackage/dist/build/mp-weixin/pages/login/login.wxml
  30. 1 1
      unpackage/dist/build/mp-weixin/pages/login/login.wxss
  31. 21 14
      unpackage/dist/build/mp-weixin/project.config.json
  32. 0 0
      unpackage/dist/build/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
  33. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  34. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  35. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  36. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  37. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  38. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map
  39. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map
  40. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  41. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  42. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map
  43. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map
  44. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/counter.js.map
  45. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map
  46. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/logisticsinfo.js.map
  47. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  48. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map
  49. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  50. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map
  51. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  52. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map
  53. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoptype.js.map
  54. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map
  55. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/ParcelExpress.js.map
  56. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/Senderinfor.js.map
  57. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/account.js.map
  58. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/delivery.js.map
  59. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map
  60. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map
  61. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/goods.js.map
  62. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/list/list.js.map
  63. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/myPackage.js.map
  64. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/orderinfo.js.map
  65. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/parcel.js.map
  66. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/recipientinfo.js.map
  67. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/search.js.map
  68. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountBalance/accountBalance.js.map
  69. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountCancellation/accountCancellation.js.map
  70. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSecurity/accountSecurity.js.map
  71. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSecurity/component/textRight.js.map
  72. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSetup/accountSetup.js.map
  73. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addEditAddress/addEditAddress.js.map
  74. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addEditAddress/component/selectCity.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addressManagement/addressManagement.js.map
  76. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addressManagement/component/address.js.map
  77. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/applicationRefund/applicationRefund.js.map
  78. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/applicationRefund/component/reasonPopup.js.map
  79. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/balanceDetail/balanceDetail.js.map
  80. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/editName/editName.js.map
  81. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureExplain/ensureExplain.js.map
  82. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureMoney/ensureMoney.js.map
  83. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/internationalAddress/internationalAddress.js.map
  84. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/agreePopup.js.map
  85. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/allRight/allRight.js.map
  86. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/moneyDetail/index.js.map
  87. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineFollow/mineFollow.js.map
  88. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/component/packageCard.js.map
  89. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/myPackage.js.map
  90. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/orderInofrmation.js.map
  91. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/refundCard.js.map
  92. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/orderForm.js.map
  93. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js.map
  94. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderFormDetail/orderFormDetail.js.map
  95. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/personalInformation/personalInformation.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/privacyPolicy/privacyPolicy.js.map
  97. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/recharge/recharge.js.map
  98. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/moneyDestination.js.map
  99. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/refundInProgress.js.map
  100. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/refundInformation.js.map

+ 1 - 0
App.vue

@@ -9,6 +9,7 @@
 		onLaunch: function() {
 			// console.log('App Launch')
 			setTimeout(() => {
+				console.log('aaaaaaaaaaaaaaa');
 				if (uni.getStorageSync("token")) {
 					this.HXlogin()
 					/* if (uni.getStorageSync("company_id") == 0) {

+ 8 - 4
components/kj-chat/kj-chat.vue

@@ -164,10 +164,14 @@
 			touchendBtn() {
 				let _this = this
 				this.longPress = '1';
+				console.log('aaaaaaaaaaa');
+				console.log(recorderManager);
 				recorderManager.onStop((res) => {
-					this.tempFilePath = res.tempFilePath
+					console.log(res);
+					_this.tempFilePath = res.tempFilePath
+					console.log(_this.tempFilePath);
 					uni.uploadFile({
-						url: 'https://hire.hdlkeji.com/api/common/upload',
+						url: 'https://cbec.hdlkeji.com/api/upload/images',
 						filePath: _this.tempFilePath,
 						name: 'file',
 						success: (res) => {
@@ -248,7 +252,7 @@
 						// shopname:this.user_other.merchant_name,
 						// image:this.user_other.image,
 						user_other: this.user_other,
-						// user:this.user
+						user:this.user
 					},
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
@@ -339,7 +343,7 @@
 						// shopname:this.user_other.merchant_name,
 						// image:this.user_other.image,
 						user_other: this.user_other,
-						// user:this.user
+						user:this.user
 					},
 				};
 				// 创建一条图片消息。

+ 31 - 27
components/kj-tabbar/kj-tabbar.vue

@@ -147,35 +147,39 @@
 		},
 		methods: {
 			account() {
-				console.log(this.checkboxValue1);
-				console.log(this.goodsList);
-				this.selegoods = [];
-				this.goodsList.map((item) => {
-					item.goods.map((items) => {
-						console.log('indexOf',this.checkboxValue1.indexOf(items.cart.id));
-						if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
-							// item.selegoods
-							console.log(items);
-							this.selegoods = this.selegoods.concat(items);
-							this.stringcheck = this.stringcheck.concat(items.cart.id);
-							console.log('333333333', this.selegoods);
-						}
+				if (this.checkboxValue1.length == 0) {
+					this.$u.toast('请选择商品')
+				} else {
+					console.log(this.checkboxValue1);
+					console.log(this.goodsList);
+					this.selegoods = [];
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							console.log('indexOf', this.checkboxValue1.indexOf(items.cart.id));
+							if (this.checkboxValue1.indexOf(items.cart.id) > -1) {
+								// item.selegoods
+								console.log(items);
+								this.selegoods = this.selegoods.concat(items);
+								this.stringcheck = this.stringcheck.concat(items.cart.id);
+								console.log('333333333', this.selegoods);
+							}
+						});
 					});
-				});
-				this.$nextTick(() => {
-					uni.navigateTo({
-						url: "/pageA/order?selelist=" +
-							encodeURIComponent(JSON.stringify(this.selegoods)) +
-							"&typea=" +
-							"shop" +
-							"&goodsPrice=" +
-							this.goodsPrice +
-							"&goodsWeight=" +
-							this.goodsWeight +
-							"&stringcheck=" +
-							this.stringcheck.toString(),
+					this.$nextTick(() => {
+						uni.navigateTo({
+							url: "/pageA/order?selelist=" +
+								encodeURIComponent(JSON.stringify(this.selegoods)) +
+								"&typea=" +
+								"shop" +
+								"&goodsPrice=" +
+								this.goodsPrice +
+								"&goodsWeight=" +
+								this.goodsWeight +
+								"&stringcheck=" +
+								this.stringcheck.toString(),
+						});
 					});
-				});
+				}
 			},
 			getLabelHeight() {
 				const dom = uni.createSelectorQuery("#tabber");

+ 5 - 3
pageA/chat/chat.vue

@@ -7,7 +7,8 @@
 					style="width: 40rpx;height: 40rpx;margin-left: 22rpx;" @click="callphone"></image>
 			</view>
 			<view class=" u-flex-col u-row-center" slot="center">
-				<text class="title">{{user_other.merchant_name}}</text>
+				<text class="title">{{user_other.merchant_name || user_other.easemob_nickname}}</text>
+				<!-- <text class="title">{{user_other.merchant_name}}</text> -->
 				<!-- <text>{{user_other.company_name || ''}}·{{user_other.type || ''}}</text> -->
 			</view>
 		</u-navbar>
@@ -20,7 +21,7 @@
 				{{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.image" class="user-img" mode=""></image>
+				<image :src="user_other.avatar" 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}}
@@ -165,7 +166,8 @@
 			}
 		},
 		onLoad(options) {
-			this.user = options.user_info
+			this.user = uni.getStorageSync('user_info')
+			console.log('user',this.user);
 			if (options.user_other) {
 				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
 			}

+ 27 - 9
pageA/chat/news.vue

@@ -6,7 +6,7 @@
 			<input type="text" placeholder="搜索聊天记录/团长" style="width: 600rpx;margin-left: 16rpx;" />
 		</view>
 		<!-- 客服 -->
-		<view class="kefu u-flex" @click="tokefu">
+		<view v-if="user_no !='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%;">
@@ -23,10 +23,16 @@
 		<view class="box ">
 			<view class="u-flex " style="margin-bottom: 26rpx;" v-for="(item,idx) in  list" :key="idx"
 				@click="chat(item.lastMessage)">
-				<image :src="item.lastMessage.ext.user_other.image" style="width: 88rpx;height: 88rpx;" mode=""></image>
+				<image :src="item.lastMessage.ext.user_other.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">{{item.lastMessage.ext.user_other.merchant_name}}</view>
+						<view class="name" v-if="item.lastMessage.to == user_no">
+							{{item.lastMessage.ext.user_other.nickname}}
+						</view>
+						<view class="name" v-else>
+							{{item.lastMessage.ext.user_other.merchant_name || item.lastMessage.ext.user.nickname}}
+						</view>	
 						<!-- <view class="name">{{item.lastMessage.ext.user}}</view> -->
 						<view class="time">
 							{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
@@ -54,10 +60,15 @@
 			return {
 				type: "error",
 				value: 1,
-				list: []
+				list: [],
+				user_no: ''
 			};
 		},
 		onLoad() {
+			this.user_no = uni.getStorageSync('user_no')
+			// this.getlist()
+		},
+		onShow() {
 			this.getlist()
 		},
 		methods: {
@@ -76,11 +87,18 @@
 				})
 			},
 			chat(item) {
-				uni.navigateTo({
-					// url: '/pageA/chat/chat?user_other_no=' + item.from + '&user_other=' + encodeURIComponent(JSON.stringify(item.ext.user)) 
-					url: '/pageA/chat/chat?user_other_no=' + item.to + '&user_other=' + encodeURIComponent(JSON.stringify(item.ext.user_other)) 
-				})
-			}  
+				if (item.from == uni.getStorageSync('user_no')) {
+					uni.navigateTo({
+						url: '/pageA/chat/chat?user_other_no=' + item.to + '&user_other=' + encodeURIComponent(JSON
+							.stringify(item.ext.user_other))
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageA/chat/chat?user_other_no=' + item.from + '&user_other=' + encodeURIComponent(
+							JSON.stringify(item.ext.user))
+					})
+				}
+			}
 		}
 	}
 </script>

+ 1 - 1
pageA/comment.vue

@@ -28,7 +28,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="" style="height: 400rpx;text-align: center;line-height: 400rpx;">
+		<view v-else class="" style="height: 400rpx;text-align: center;line-height: 400rpx;">
 			{{i18n.nodata}}
 		</view>
 	</view>

+ 9 - 2
pageA/productdetails.vue

@@ -391,7 +391,8 @@
 					<text class="info" style="font-size: 32rpx">
 						{{ i18n.shar }}
 					</text>
-					<image src="../static/images/index/bottom2.png" style="width: 40rpx; height: 40rpx">
+					<image @click="toxieyi" src="../static/images/index/bottom2.png"
+						style="width: 40rpx; height: 40rpx">
 					</image>
 				</view>
 				<!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
@@ -602,6 +603,12 @@
 
 		},
 		methods: {
+			//返佣规则
+			toxieyi() {
+				uni.navigateTo({
+					url: '/pageB/xieyi?code=' + 'rebate_proportion'
+				})
+			},
 			//解析链接地址
 			GetwxUrlParam(url) {
 				let theRequest = {};
@@ -884,7 +891,7 @@
 							sku_item_id: this.sku_info.id, //38 是 String 规格详情id
 							merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
 							belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
-							share_member_id:this.share_merchant_id, //是 String 分享团长id
+							share_member_id: this.share_merchant_id, //是 String 分享团长id
 						})
 						.then((res) => {
 							this.$u.toast("添加成功");

+ 561 - 16
pageA/service/service.vue

@@ -1,43 +1,588 @@
 <template>
-	<!-- 客服聊天 -->
-	<view>
+	<view class="chat-pages">
 		<u-navbar title="在线客服" :safeAreaInsetTop="true" :placeholder='true'>
 			<view class="u-nav-slot u-flex" slot="left">
-				<u-icon @click="retu" name="arrow-left" size="19"></u-icon>
+				<u-icon @click="return1" name="arrow-left" size="19"></u-icon>
 				<image src="../static/images/phone.png" style="width: 40rpx;height: 40rpx;margin-left: 44rpx;" mode="">
 				</image>
 			</view>
 		</u-navbar>
-		<view class="box">
-			<view class=""></view>
-		</view>
-		<view class="bottom">
 
+		<view class="" style="height: 100rpx;"></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="/pageA/static/images/kefu.png" 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 style="max-width: 80%;" v-if="item.type == 'audio'">
+					<view class="chat-text hflex acenter" style="background: #D3E5FB;max-width: 550rpx;"
+						@click="playaudio(item.url)">
+						<image src="static/yuyin-left.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
+						<text :style="'padding-right: ' + item.length * 10 + 'rpx'">{{item.length}}</text>
+					</view>
+				</view>
+				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
+					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
+					<view class="header-top u-flex u-row-between">
+						<view class="header-left">
+							<view class="u-flex">
+								<text class="text1">{{item.ext.order.name}}</text>
+							</view>
+						</view>
+						<view class="header-right">
+							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
+							<image src="../static/images/nan.png" class="sex" mode=""
+								v-if="item.ext.order.sex == 'male'"></image>
+							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
+						</view>
+					</view>
+					<view class="goutong-time">
+						{{renderTime(item.time)}} 发起沟通
+					</view>
+				</view>
+				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
+					<view class="header1-top u-flex u-row-between">
+						<text>{{item.ext.order.title}}</text>
+						<text>{{item.ext.order.salary}}K</text>
+					</view>
+					<view class="goutong-time1">
+						{{renderTime(item.time)}} 发起沟通
+					</view>
+				</view>
+				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
+					<view class="header1-top u-flex u-row-between">
+						<text>{{item.ext.order.title}}</text>
+						<text>{{item.ext.order.salary}}K</text>
+					</view>
+					<view class="goutong-time1">
+						{{renderTime(item.time)}} 发起沟通
+					</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 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/yuyin-right.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
+					</view>
+				</view>
+				<image :src="item.msg ? item.msg : item.url" v-if="item.type === 'img'" mode="widthFix"
+					style="width: 200px;text-align: right;" @click="previewimg(item.url)"></image>
+				<view class="chat-header" v-if="item.type == 'txt' && item.ext.type == 'cand'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
+					<view class="header-top u-flex u-row-between">
+						<view class="header-left">
+							<view class="u-flex">
+								<text class="text1">{{item.ext.order.name}}</text>
+							</view>
+						</view>
+						<view class="header-right">
+							<image :src="item.ext.order.avatar" class="right-img" mode=""></image>
+							<image src="../static/images/nan.png" class="sex" mode=""
+								v-if="item.ext.order.sex == 'male'"></image>
+							<image src="../static/images/nv.png" class="sex" mode="" v-else></image>
+						</view>
+					</view>
+					<view class="goutong-time">
+						{{renderTime(item.time)}} 发起沟通
+					</view>
+				</view>
+				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'pos'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'pos')">
+					<view class="header1-top u-flex u-row-between">
+						<text>{{item.ext.order.title}}</text>
+						<text>{{item.ext.order.salary}}K</text>
+					</view>
+					<view class="goutong-time1">
+						{{renderTime(item.time)}} 发起沟通
+					</view>
+				</view>
+				<view class="chat-header1" v-if="item.type == 'txt' && item.ext.type == 'order'"
+					:style="{top:(statusheight + 58) + 'px'}" @click="toinfo(item,'order')">
+					<view class="header1-top u-flex u-row-between">
+						<text>{{item.ext.order.title}}</text>
+						<text>{{item.ext.order.salary}}K</text>
+					</view>
+					<view class="goutong-time1">
+						{{renderTime(item.time)}} 发起沟通
+					</view>
+				</view>
+				<image v-if="item.from == user_no" :src="user.avatar" class="user-img" mode=""></image>
+			</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>
 </template>
 
 <script>
+	import vueBus from '@/utils/vueBus.js'
+	import WebIM from '@/newSDK/Easemob-chat-4.1.7.js'
+	import {
+		conn
+	} from '@/utils/WebIM';
+	import {
+		renderTime
+	} from '@/utils/index'
+	const innerAudioContext = uni.createInnerAudioContext()
 	export default {
 		data() {
 			return {
+				user_other_no: '13523652365',
+				user_no: '',
+				user: {},
+				user_other: {},
+				pageSize: 20,
+				loadText: '',
+				list: [],
+				renderTime,
+				playStatus: 0, //录音播放状态 0:未播放 1:正在播放
+				statusheight: '',
+			}
+		},
+		onLoad(options) {
+			this.user = uni.getStorageSync('user_info')
+			console.log('user', this.user);
+			if (options.user_other) {
+				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
+			}
+			// this.statusheight = uni.getSystemInfoSync().statusBarHeight,
+			// this.user_other = options.user_other, //用户信息
+			if (uni.getStorageSync('user_no')) {
+				this.user_no = uni.getStorageSync('user_no')
+			} else {
+				// index().then((res) => {
+
 
-			};
+				// })
+			}
+			vueBus.$on('message', this.getdata)
+		},
+		onShow() {
+			this.getdata()
 		},
-		methods:{
-			retu(){
+		methods: {
+			callphone() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					console.log(res);
+
+					uni.makePhoneCall({
+						phoneNumber: res.service_mobile
+					})
+				}).catch(() => {})
+			},
+			previewimg(url) {
+				let urls = []
+				urls.push(url)
+				uni.previewImage({
+					urls: urls,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
+			playaudio(url) {
+				let _this = this
+				innerAudioContext.src = url
+				console.log(url);
+				var music = wx.setInnerAudioOption({
+					obeyMuteSwitch: false,
+					success: function(res) {
+						console.log("开启静音模式下播放音乐的功能");
+					},
+					fail: function(err) {
+						console.log(err);
+						console.log("静音设置失败");
+					},
+				});
+				console.log(this.playStatus);
+				if (this.playStatus == 0) {
+					innerAudioContext.play()
+					innerAudioContext.onPlay(() => {
+						console.log('开始播放');
+						_this.playStatus = 1
+					});
+				} else {
+					innerAudioContext.pause()
+					innerAudioContext.onPause(() => {
+						console.log('暂停播放');
+						_this.playStatus = 0
+					});
+				}
+				innerAudioContext.onError((res) => {
+					console.log('onError', res.errMsg);
+					console.log('onError', res.errCode);
+				});
+				innerAudioContext.onEnded((res) => {
+					_this.playStatus = 0
+				})
+			},
+			return1() {
 				uni.navigateBack()
+			},
+			getuser() {
+				let that = this
+				getEmchatUsersData({
+					user_no: this.user_no + ',' + this.user_other_no,
+				}).then((res) => {
+					if (res.code == 1) {
+						this.user = res.data[0]
+						this.user_other = res.data[1]
+					} else {
+						that.$u.toast(res.msg)
+					}
+				})
+			},
+			getdata() {
+				let option2 = {
+					chatType: "singleChat", // 会话类型,设置为单聊。
+					type: "channel", // 消息类型。
+					to: this.user_other_no, // 接收消息对象的用户 ID。
+				};
+				let msg2 = new WebIM.message.create(option2);
+				conn.send(msg2);
+				let options = {
+					// 对方的用户 ID 或者群组 ID 或聊天室 ID。
+					targetId: this.user_other_no,
+					// 每页期望获取的消息条数。取值范围为 [1,50],默认值为 20。
+					pageSize: this.pageSize,
+					// 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串,从最新消息开始。
+					cursor: -1,
+					// 会话类型:(默认) `singleChat`:单聊;`groupChat`:群聊。
+					chatType: "singleChat",
+					// 消息搜索方向:(默认)`up`:按服务器收到消息的时间的逆序获取;`down`:按服务器收到消息的时间的正序获取。
+					searchDirection: "up",
+				};
+				conn.getHistoryMessages(options).then((res) => {
+						console.log('res', res);
+						// 成功获取历史消息。
+						if (res.isLast) {
+							this.loadText = '已无更多数据';
+						}
+						this.list = res.messages.reverse()
+						console.log(this.list);
+						this.$nextTick(() => {
+							uni.pageScrollTo({
+								scrollTop: 99999
+							})
+						})
+					})
+					.catch((e) => {
+						// 获取失败。
+						console.log('失败', e);
+					});
+			},
+			toinfo(item, type) {
+				if (type == 'pos' && item.ext.order.item_url) {
+					uni.navigateTo({
+						url: "/pagesB/details?id=" + item.ext.order.item_url
+					})
+				} else if (type == 'cand') {
+					uni.navigateTo({
+						url: "/pagesC/rencai-info?id=" + item.ext.order.item_url
+					})
+				} else if (type == 'order') {
+					uni.navigateTo({
+						url: "/pagesD/order-detail?id=" + item.ext.order.item_url
+					})
+				}
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.box {
-		width: 750rpx;
-		height: 166rpx;
-		background: #FFFFFF;
-		position: fixed;
-		bottom: 0;
+	.title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.jend {
+		justify-content: flex-end;
+	}
+
+	.chat-pages {
+		.chat-header1 {
+			width: 702rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			position: sticky;
+			left: 24rpx;
+			// z-index: 20;
+			margin: 10px auto;
+			padding: 0 20rpx;
+
+			.goutong-time1 {
+				line-height: 80rpx;
+				font-size: 24rpx;
+				font-family: SFPro-Regular, SFPro;
+				font-weight: 400;
+				color: #777777;
+				border-top: 2rpx solid #F0F0F0;
+			}
+
+			.zhiwei-text {
+				font-size: 26rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #555555;
+				padding-bottom: 20rpx;
+				border-bottom: 2rpx solid #F0F0F0;
+			}
+
+			.zhiwei-title {
+				font-size: 26rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #555555;
+				margin-bottom: 20rpx;
+			}
+
+			.chat-label1 {
+				padding: 8rpx 0 10rpx 0;
+
+				text {
+					margin-right: 10rpx;
+					margin-bottom: 10rpx;
+					line-height: 40rpx;
+					background: #F3F3F3;
+					border-radius: 4rpx;
+					padding: 0 12rpx;
+					font-size: 24rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #555555;
+				}
+			}
+
+			.jingli1-box {
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #555555;
+				margin-bottom: 20rpx;
+			}
+
+			.header1-top {
+				padding: 24rpx 0 20rpx 0;
+
+				text:frist-child {
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #222222;
+				}
+
+				text:last-child {
+					font-size: 32rpx;
+					font-family: DINAlternate-Bold, DINAlternate;
+					font-weight: bold;
+					color: #0C66C2;
+				}
+			}
+		}
+
+		.chat-item {
+			padding: 0 24rpx;
+			margin-bottom: 20rpx;
+
+			.chat-item-box {
+
+				.chat-text {
+					border-radius: 20rpx;
+					background-color: #fff;
+					max-width: 100%;
+					margin: 0 20rpx;
+					font-size: 30rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #141414;
+					padding: 20rpx 24rpx;
+				}
+
+				.user-img {
+					width: 92rpx;
+					height: 92rpx;
+					border-radius: 100rpx;
+				}
+			}
+
+			.chat-time {
+				text-align: center;
+				margin-bottom: 30rpx;
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #777777;
+			}
+		}
+
+		.chat-header {
+			width: 702rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			position: sticky;
+			left: 24rpx;
+			z-index: 20;
+			margin: 10px auto;
+			padding: 0 20rpx;
+
+			.goutong-time {
+				line-height: 80rpx;
+				font-size: 24rpx;
+				font-family: SFPro-Regular, SFPro;
+				font-weight: 400;
+				color: #777777;
+				border-top: 2rpx solid #F0F0F0;
+			}
+
+			.chat-label {
+				padding: 8rpx 0 10rpx 0;
+
+				text {
+					margin-right: 10rpx;
+					margin-bottom: 10rpx;
+					line-height: 40rpx;
+					background: #F3F3F3;
+					border-radius: 4rpx;
+					padding: 0 12rpx;
+					font-size: 24rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #555555;
+				}
+			}
+
+			.jingli-box {
+				margin-bottom: 12rpx;
+
+				.img {
+					width: 28rpx;
+					height: 28rpx;
+				}
+
+				.text1 {
+					font-size: 28rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #222222;
+					margin: 0 12rpx;
+					flex: 1;
+				}
+
+				.text2 {
+					font-size: 22rpx;
+					font-family: SFPro-Regular, SFPro;
+					font-weight: 400;
+					color: #888888;
+				}
+			}
+
+			.header-top {
+				height: 150rpx;
+
+				.header-right {
+					width: 96rpx;
+					height: 96rpx;
+					position: relative;
+
+					.sex {
+						position: absolute;
+						bottom: 0;
+						right: 4rpx;
+						width: 20rpx;
+						height: 20rpx;
+					}
+
+					.right-img {
+						width: 96rpx;
+						height: 96rpx;
+						border-radius: 100rpx;
+					}
+				}
+
+				.header-left {
+					.text3 {
+						font-size: 26rpx;
+						font-family: SFPro-Regular, SFPro;
+						font-weight: 400;
+						color: #666666;
+						margin-top: 10rpx;
+					}
+
+					.text1 {
+						font-size: 36rpx;
+						font-family: PingFangSC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #222222;
+						margin-right: 28rpx;
+					}
+
+					.text2 {
+						font-size: 26rpx;
+						font-family: PingFangSC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #222222;
+					}
+				}
+			}
+		}
+
+		.chat-navbar {
+			flex: 1;
+			// padding-left: 100rpx;
+
+			text:first-child {
+				font-size: 36rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #141414;
+			}
+
+			text:last-child {
+				font-size: 22rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #777777;
+			}
+		}
+	}
+
+	page {
+		background-color: #F3F3F3;
 	}
 </style>

+ 1 - 1
pageB/ParcelExpress.vue

@@ -195,7 +195,7 @@
 				// this.internationalshow = true
 				// this.international()
 				uni.navigateTo({
-					url:'/pageB/xieyi'
+					url:'/pageB/xieyi?code=' + 'international_express_service'
 				})
 			},
 			//国际快递服务协议

+ 1 - 1
pageB/delivery.vue

@@ -201,7 +201,7 @@
 			//协议
 			internationalshowa() {
 				uni.navigateTo({
-					url:'/pageB/xieyi'
+					url:'/pageB/xieyi?code=' + 'international_express_service'
 				})
 			},
 			//国际快递服务协议

+ 9 - 4
pageB/xieyi.vue

@@ -11,17 +11,22 @@
 			return {
 				content: "",
 				contenttitle:'',
-				language:'zh-CN'
+				language:'zh-CN',
+				code:''
 			};
 		},
 		onLoad(options) {
 			if (uni.getStorageSync("language") != "") {
 				this.language = uni.getStorageSync("language");
 			}
+			if(options.code){
+				this.code = options.code
+			}
 		},
 		methods: {
-			getAgreementContent() {
-				uni.$u.http.get(`/api/agreement?code=international_express_service`).then((res) => {
+			
+			getAgreementContent(code) {
+				uni.$u.http.get(`/api/agreement?code=`+code ).then((res) => {
 					if (this.language == 'zh-CN') {
 						this.content = res.content_cn
 						this.contenttitle = res.name_cn
@@ -45,7 +50,7 @@
 			},
 		},
 		mounted() {
-			this.getAgreementContent();
+			this.getAgreementContent(this.code);
 		},
 	};
 </script>

+ 4 - 0
pages/cart/cart.vue

@@ -179,6 +179,10 @@
 			this.tabarheight = tab;
 		},
 		onShow() {
+			this.goodsNum = 0 //购物车商品数量
+			this.goodsWeight = 0 //商品重量
+			this.goodsPrice = 0 //商品价格
+			this.checkboxValue1 = []
 			this.getShopCarList();
 		},
 		methods: {

+ 2 - 2
pages/express/express.vue

@@ -151,7 +151,7 @@
 					<view class="flexc" style="position: relative;" @click="pack('transit_receipt')">
 						<view class="" style="position: relative;width: 68rpx;height: 68rpx;">
 							<u-badge :absolute='true' :offset="[0,-15]" :type="type" max="99"
-								:value="transit"></u-badge>
+								:value="receipt"></u-badge>
 							<image src="/static/express/sign.png" style='width:68rpx;height:68rpx' mode=""></image>
 						</view>
 						<text style='margin-top:16rpx' class="bao">{{i18n.Sign}}</text>
@@ -159,7 +159,7 @@
 					<view class="flexc" style="position: relative;" @click="pack('to_overseas')">
 						<view class="" style="position: relative;width: 68rpx;height: 68rpx;">
 							<u-badge :absolute='true' :offset="[0,-15]" :type="type" max="99"
-								:value="transit"></u-badge>
+								:value="overseas"></u-badge>
 							<image src="../../static/express/send.png" style='width:68rpx;height:68rpx' mode=""></image>
 						</view>
 						<text style='margin-top:16rpx' class="bao">{{i18n.overseas}}</text>

+ 8 - 6
pages/index/index.vue

@@ -174,7 +174,7 @@
 							¥{{item.weight}}/kg
 						</text>
 					</view>
-					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
+					<view v-if="item.label_arr" class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
 						<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
 							style="border: 1rpx solid #E5BC78;color: #E5BC78;">
 							<text>{{child.name_cn}}</text>
@@ -254,7 +254,7 @@
 			i18n() {
 				return this.$t('index')
 			},
-			list(){
+			list() {
 				var list = []
 				list = [this.i18n.border, this.i18n.shop]
 				return list
@@ -271,7 +271,7 @@
 			}
 		},
 		onLoad(options) {
-			
+
 			// this.seater()
 			if (options.current) {
 				this.current = options.current
@@ -303,14 +303,14 @@
 					}
 				}).then((res) => {
 					console.log(res);
-			
+
 					uni.makePhoneCall({
 						phoneNumber: res.service_mobile
 					})
 				}).catch(() => {
-			
+
 				})
-			
+
 			},
 			advert() {
 				console.log(this.url);
@@ -359,6 +359,8 @@
 			},
 			//标签切换
 			changetab(e) {
+				this.page = 1
+				this.last_page = 0
 				this.index = e.index
 				this.parent_id = e.id
 				if (this.index == 0) {

+ 34 - 18
pages/login/login.vue

@@ -26,9 +26,9 @@
 				</u-checkbox>
 			</u-checkbox-group>
 			<text class="fontYin">我已阅读并同意</text>
-			<text class="fontYin" style="color: #f83224">《用户协议》</text>
+			<text class="fontYin" style="color: #f83224" @click="xieyi('user')">《用户协议》</text>
 			<text class="fontYin">和</text>
-			<text class="fontYin" style="color: #f83224">《隐私协议》</text>
+			<text class="fontYin" style="color: #f83224" @click="xieyi('private')">《隐私协议》</text>
 		</view>
 	</view>
 </template>
@@ -51,6 +51,12 @@
 			};
 		},
 		methods: {
+			//协议
+			xieyi(code) {
+				uni.navigateTo({
+					url: '/pageB/xieyi?code=' + code
+				})
+			},
 			//微信登录
 			tologin(e) {
 				if (this.changea.length > 0) {
@@ -82,16 +88,21 @@
 																.easemob_username)
 															uni.setStorageSync('pwd', res
 																.easemob_password)
-															var options = {
+															// var options = {
+															// 	user: res.easemob_username,
+															// 	pwd: res.easemob_password,
+															// 	appKey: conn.appkey,
+															// };
+															// conn.open(options);
+															conn.open({
 																user: res.easemob_username,
 																pwd: res.easemob_password,
-																appKey: conn.appkey,
-																success: function(res2) {
-
-																},
-																error: function() {}
-															};
-															conn.open(options);
+																appKey: conn.appkey
+															}).then(() => {
+																console.log('res');
+															}).catch(reason => {
+																console.log('失败', reason);
+															})
 															uni.setStorageSync("token", res.token);
 															uni.setStorageSync("openid", res
 																.openid);
@@ -113,16 +124,21 @@
 												.easemob_username)
 											uni.setStorageSync('pwd', res
 												.easemob_password)
-											var options = {
+											// var options = {
+											// 	user: res.easemob_username,
+											// 	pwd: res.easemob_password,
+											// 	appKey: conn.appkey,
+											// };
+											// conn.open(options);
+											conn.open({
 												user: res.easemob_username,
 												pwd: res.easemob_password,
-												appKey: conn.appkey,
-												success: function(res2) {
-
-												},
-												error: function() {}
-											};
-											conn.open(options);
+												appKey: conn.appkey
+											}).then(() => {
+												console.log('res');
+											}).catch(reason => {
+												console.log('失败', reason);
+											})
 											setTimeout(() => {
 												uni.navigateTo({
 													url: "/pageA/changelange",

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/chat.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/chat/news.wxml


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/addressManagement/addressManagement.js


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

@@ -1 +1 @@
-<view class="data-v-119d42a7"><view class="top-tab data-v-119d42a7"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-119d42a7',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-119d42a7',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-119d42a7"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-119d42a7" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-119d42a7">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-119d42a7"><button class="wx data-v-119d42a7">{{i18n.wx}}</button><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress']]]]]}}" class="add data-v-119d42a7" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-119d42a7"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress']]]]]}}" class="add-international data-v-119d42a7" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>
+<view class="data-v-c6d24012"><view class="top-tab data-v-c6d24012"><view data-event-opts="{{[['tap',[['switchTab',[1]]]]]}}" class="{{['data-v-c6d24012',(manage==1)?'select':'']}}" bindtap="__e">{{''+i18n.inland+''}}</view><view data-event-opts="{{[['tap',[['switchTab',[0]]]]]}}" class="{{['data-v-c6d24012',(manage==0)?'select':'']}}" bindtap="__e">{{''+i18n.international+''}}</view></view><block wx:if="{{$root.g0!=0}}"><view class="content data-v-c6d24012"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><address-vue vue-id="{{'82512880-1-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^deleteAddress',[['deleteAddress']]],['^setDefault',[['setDefault']]],['^toDetail',[['toDetail']]],['^goBack',[['goBack',['$0'],[[['addressList','id',item.id]]]]]]]}}" bind:deleteAddress="__e" bind:setDefault="__e" bind:toDetail="__e" bind:goBack="__e" class="data-v-c6d24012" bind:__l="__l"></address-vue></block></view></block><block wx:else><view class="empty data-v-c6d24012">空空如也~</view></block><block wx:if="{{manage==1}}"><view class="footer data-v-c6d24012"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/addEditAddress/addEditAddress']]]]]}}" class="add-international data-v-c6d24012" bindtap="__e">{{''+i18n.add+''}}</button></view></block><block wx:else><view class="footer data-v-c6d24012"><button data-event-opts="{{[['tap',[['toAddRess',['/pageC/internationalAddress/internationalAddress']]]]]}}" class="add-international data-v-c6d24012" bindtap="__e">{{''+i18n.add+''}}</button></view></block></view>

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

@@ -1 +1 @@
-.top-tab.data-v-119d42a7{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-119d42a7{position:relative;font-weight:600}.top-tab .select.data-v-119d42a7::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-119d42a7{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-119d42a7{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-119d42a7{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-119d42a7{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-119d42a7{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-119d42a7{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}
+.top-tab.data-v-c6d24012{display:flex;font-size:32rpx;color:rgba(34,34,34,.8);justify-content:space-around;background-color:#fff;height:80rpx;align-items:center}.top-tab .select.data-v-c6d24012{position:relative;font-weight:600}.top-tab .select.data-v-c6d24012::before{content:"";display:block;width:50%;height:4rpx;background-color:#f83224;position:absolute;bottom:-20rpx;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.content.data-v-c6d24012{padding:20rpx 24rpx;padding-bottom:200rpx}.empty.data-v-c6d24012{font-size:28rpx;display:flex;justify-content:center;align-items:center;color:rgba(51,51,51,.7);margin-top:200rpx}.footer.data-v-c6d24012{position:fixed;bottom:0;background-color:#fff;display:flex;justify-content:space-around;width:750rpx;padding:20rpx 0 66rpx}.footer .wx.data-v-c6d24012{width:338rpx;background-color:#fff;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#222;padding:0;margin:0;border:2rpx solid #979797}.footer .add.data-v-c6d24012{width:338rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;padding:0;margin:0}.footer .add-international.data-v-c6d24012{width:702rpx;background-color:#f83224;border-radius:40rpx;height:80rpx;font-size:32rpx;color:#fff;margin:0 auto}

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"15c9":function(e,n,t){},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.discount_price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.discount_price)-this.discountPrice}}};n.default=o},8884:function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},b14e:function(e,n,t){"use strict";var o=t("15c9"),i=t.n(o);i.a},caec:function(e,n,t){"use strict";t.r(n);var o=t("8884"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("b14e");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"45ec99e2",null,!1,o["a"],c);n["default"]=s.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/discountsPopup"],{"0085":function(e,n,t){"use strict";t.r(n);var o=t("20a80"),i=t.n(o);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);n["default"]=i.a},"0b33":function(e,n,t){},"20a80":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{show:{typeof:Boolean,default:!1},selectGoodsInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{value:"",discountPrice:0,preferential:0}},methods:{close:function(){this.value="",this.discountPrice=0,this.preferential=0,this.$emit("close")},confirm:function(){this.$emit("close",this.value),this.value="",this.discountPrice=0,this.preferential=0},change:function(e){console.log(this.selectGoodsInformation),this.discountPrice=Number(this.selectGoodsInformation.goods.discount_price)*(.01*Number(e)),this.preferential=Number(this.selectGoodsInformation.goods.discount_price)-this.discountPrice}}};n.default=o},"6e44":function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){return o}));var o={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--input/u--input")]).then(t.bind(null,"bead"))}},i=function(){var e=this,n=e.$createElement;e._self._c},u=[]},"84a3":function(e,n,t){"use strict";var o=t("0b33"),i=t.n(o);i.a},caec:function(e,n,t){"use strict";t.r(n);var o=t("6e44"),i=t("0085");for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t("84a3");var c,r=t("f0c5"),s=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"6e3c15d0",null,!1,o["a"],c);n["default"]=s.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/discountsPopup-create-component',
     {

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-45ec99e2" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-45ec99e2"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-45ec99e2"><image class="goods-img data-v-45ec99e2" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-45ec99e2"><view class="title data-v-45ec99e2">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-45ec99e2">{{'¥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-45ec99e2"><view class="data-v-45ec99e2">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="2" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-45ec99e2" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-45ec99e2">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-45ec99e2"><view class="_text-1 data-v-45ec99e2"><text class="data-v-45ec99e2">折扣价</text><text class="data-v-45ec99e2">{{"¥"+discountPrice}}</text></view><view class="_text-1 data-v-45ec99e2"><text class="data-v-45ec99e2">优惠</text><text style="color:#f83224;" class="data-v-45ec99e2">{{"-¥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-45ec99e2" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-6e3c15d0" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-6e3c15d0"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-6e3c15d0"><image class="goods-img data-v-6e3c15d0" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-6e3c15d0"><view class="title data-v-6e3c15d0">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-6e3c15d0">{{'¥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-6e3c15d0"><view class="data-v-6e3c15d0">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6e3c15d0" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-6e3c15d0">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-6e3c15d0"><view class="_text-1 data-v-6e3c15d0"><text class="data-v-6e3c15d0">折扣价</text><text class="data-v-6e3c15d0">{{"¥"+discountPrice}}</text></view><view class="_text-1 data-v-6e3c15d0"><text class="data-v-6e3c15d0">优惠</text><text style="color:#f83224;" class="data-v-6e3c15d0">{{"-¥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-6e3c15d0" bindtap="__e">确定</button></view></u-popup>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/discountsPopup.wxss

@@ -1 +1 @@
-.content.data-v-45ec99e2{padding:30rpx 24rpx}.content .goods-information.data-v-45ec99e2{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-45ec99e2{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-45ec99e2{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-45ec99e2{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-45ec99e2{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-45ec99e2{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-45ec99e2{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-45ec99e2{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-45ec99e2{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}
+.content.data-v-6e3c15d0{padding:30rpx 24rpx}.content .goods-information.data-v-6e3c15d0{display:flex;justify-content:flex-start}.content .goods-information .goods-img.data-v-6e3c15d0{width:104rpx;height:104rpx;border-radius:10rpx;margin-right:20rpx}.content .goods-information .goods-right.data-v-6e3c15d0{display:flex;flex-direction:column;justify-content:space-around;width:70%}.content .goods-information .goods-right .title.data-v-6e3c15d0{font-size:28rpx;color:#333;width:70%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.content .goods-information .goods-right .price.data-v-6e3c15d0{font-size:28rpx;opacity:.8;color:#333}.content .discount.data-v-6e3c15d0{display:flex;padding:36rpx;border-radius:10rpx;border:2rpx solid #f83224;margin-top:56rpx;font-size:30rpx;color:#222;align-items:center;font-weight:600}.content .text-list.data-v-6e3c15d0{border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:40rpx}.content .text-list ._text-1.data-v-6e3c15d0{display:flex;justify-content:space-between;height:100rpx;align-items:center;font-size:28rpx}.content .btn.data-v-6e3c15d0{background-color:#f83224;border-radius:44rpx;color:#fff;margin-top:30rpx}

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"0f1b":function(t,n,o){"use strict";var e=o("6bc0"),i=o.n(e);i.a},"6bc0":function(t,n,o){},"7a07":function(t,n,o){"use strict";o.r(n);var e=o("d7ef"),i=o("9516");for(var u in i)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(u);o("0f1b");var r,c=o("f0c5"),a=Object(c["a"])(i["default"],e["b"],e["c"],!1,null,"3433bc12",null,!1,e["a"],r);n["default"]=a.exports},9516:function(t,n,o){"use strict";o.r(n);var e=o("9bdc"),i=o.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=i.a},"9bdc":function(t,n,o){"use strict";var e=o("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e(o("9523")),u=(0,i.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=u},d7ef:function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e=t.itemInfo.goods.discount_price.split("."),i=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:i}})},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"146a":function(t,n,o){},"7a07":function(t,n,o){"use strict";o.r(n);var e=o("91f1"),a=o("9516");for(var i in a)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return a[t]}))}(i);o("a198");var u,r=o("f0c5"),c=Object(r["a"])(a["default"],e["b"],e["c"],!1,null,"74639aaf",null,!1,e["a"],u);n["default"]=c.exports},"91f1":function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return a})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){return e}));var a=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e=t.itemInfo.goods.discount_price.split("."),a=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:a}})},i=[]},9516:function(t,n,o){"use strict";o.r(n);var e=o("9bdc"),a=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(i);n["default"]=a.a},"9bdc":function(t,n,o){"use strict";var e=o("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=e(o("9523")),i=(0,a.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=i},a198:function(t,n,o){"use strict";var e=o("146a"),a=o.n(e);a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/goodsInformation-create-component',
     {

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.wxml


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.wxss


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/login/login.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/login/login.wxml


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

@@ -1 +1 @@
-page.data-v-136e742c{background-color:#fff!important;height:100vh}.login-btn.data-v-136e742c{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-136e742c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-7bad7cb4{background-color:#fff!important;height:100vh}.login-btn.data-v-7bad7cb4{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-7bad7cb4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

+ 21 - 14
unpackage/dist/build/mp-weixin/project.config.json

@@ -1,29 +1,36 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": true,
+    "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.5.1",
+  "libVersion": "",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
   }
 }

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/build/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/counter.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/logisticsinfo.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoptype.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/ParcelExpress.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/Senderinfor.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/account.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/delivery.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/expresstype.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/goods.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/list/list.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/myPackage.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/orderinfo.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/parcel.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/recipientinfo.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/search.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountBalance/accountBalance.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountCancellation/accountCancellation.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSecurity/accountSecurity.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSecurity/component/textRight.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/accountSetup/accountSetup.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addEditAddress/addEditAddress.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addEditAddress/component/selectCity.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addressManagement/addressManagement.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/addressManagement/component/address.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/applicationRefund/applicationRefund.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/applicationRefund/component/reasonPopup.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/balanceDetail/balanceDetail.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/editName/editName.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureExplain/ensureExplain.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureMoney/ensureMoney.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/internationalAddress/internationalAddress.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/agreePopup.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/allRight/allRight.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineComponent/moneyDetail/index.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineFollow/mineFollow.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/component/packageCard.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/myPackage.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/orderInofrmation.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/refundCard.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/orderForm.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderFormDetail/orderFormDetail.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/personalInformation/personalInformation.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/privacyPolicy/privacyPolicy.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/recharge/recharge.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/moneyDestination.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/refundInProgress.js.map


文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/refundDetail/component/refundInformation.js.map


部分文件因文件數量過多而無法顯示