解决冲突

commont/messages.js

@@ -273,6 +273,7 @@ export default {
       //个人功能
       thatPerson: "个人功能",
       become: "成为团长",
+	  chase:'购'
     },
   },
   //英语
@@ -545,6 +546,7 @@ export default {
       //个人功能
       thatPerson: "Personal functions",
       become: "Become a team leader",
+	  chase:'purchase'
     },
   },
   // 西班牙
@@ -819,6 +821,8 @@ export default {
       //个人功能
       thatPerson: "Función personal",
       become: "Convertirse en Jefe de grupo",
+	  chase:'compra'
+	  
     },
   },
   //意大利
@@ -1093,6 +1097,7 @@ export default {
       //个人功能
       thatPerson: "Funzioni personali",
       become: "Diventa un team leader",
+	  chase:'acquisto'
     },
   },
 };

components/kj-chat/kj-chat.vue

@@ -111,6 +111,10 @@
 			user_other:{
 				type:Object,
 				default:{}
+			},
+			user:{
+				type:Object,
+				default:{}
 			}
 		},
 		data() {
@@ -241,8 +245,9 @@
 					to: this.to, // 接收消息对象（用户id）
 					chatType: 'singleChat', // 设置为单聊
 					ext: {
-						shopname:this.user_other.merchant_name,
-						image:this.user_other.image,
+						// shopname:this.user_other.merchant_name,
+						// image:this.user_other.image,
+						user:this.user
 					},
 					success: function(id, serverMsgId) {
 						console.log('成功发送消息');
@@ -331,7 +336,8 @@
 					to: this.to,
 					ext: {
 						shopname:this.user_other.merchant_name,
-						image:this.user_other.image
+						image:this.user_other.image,
+						user:this.user
 					},
 				};
 				// 创建一条图片消息。

components/kj-tabbar/kj-tabbar.vue

@@ -1,335 +1,334 @@
 <template>
-  <view id="tabber" style="position: fixed; z-index: 1000; bottom: 0">
-    <view class="bottom u-flex u-row-between" v-if="value1 == 3">
-      <view class="u-flex">
-        <u-checkbox-group v-model="all" placement="column" @change="checkAll">
-          <u-checkbox
-            shape="circle"
-            :name="i18n.selectall"
-            activeColor="#F83224"
-          >
-          </u-checkbox>
-        </u-checkbox-group>
-        <text class="all">{{ i18n.selectall }}</text>
-      </view>
-      <view v-if="success == false" class="dle">
-        {{ i18n.delete }}
-      </view>
-      <view class="u-flex" v-else>
-        <view class="">
-          <text class="allweight">{{ i18n.Grossweight }} </text>
-          <text class="allweight"> {{ goodsWeight }}kg,</text>
-          <text class="sum">{{ i18n.total }}:</text>
-          <text class="summon">¥</text>
-          <text class="summon" style="font-size: 36rpx">{{
+	<view id="tabber" style="position: fixed; z-index: 1000; bottom: 0">
+		<view class="bottom u-flex u-row-between" v-if="value1 == 3">
+			<view class="u-flex">
+				<u-checkbox-group v-model="all" placement="column" @change="checkAll">
+					<u-checkbox shape="circle" :name="i18n.selectall" activeColor="#F83224">
+					</u-checkbox>
+				</u-checkbox-group>
+				<text class="all">{{ i18n.selectall }}</text>
+			</view>
+			<view v-if="success == false" class="dle">
+				{{ i18n.delete }}
+			</view>
+			<view class="u-flex" v-else>
+				<view class="">
+					<text class="allweight">{{ i18n.Grossweight }} </text>
+					<text class="allweight"> {{ goodsWeight }}kg,</text>
+					<text class="sum">{{ i18n.total }}:</text>
+					<text class="summon">¥</text>
+					<text class="summon" style="font-size: 36rpx">{{
             goodsPrice.split(".")[0]
           }}</text>
-          <text class="summon">.{{ goodsPrice.split(".")[1] }}</text>
-        </view>
-        <view class="settle" @click="account">{{ i18n.GotoResult }}</view>
-      </view>
-    </view>
-    <u-tabbar
-      :list="list"
-      active-color="#F83224"
-      inactive-color="#333"
-      :value="value1"
-    >
-      <u-tabbar-item
-        :text="item.text"
-        v-for="(item, idx) in list"
-        @click="click1"
-        :key="idx"
-      >
-        <image
-          style="width: 40rpx; height: 40rpx"
-          class="u-page__item__slot-icon"
-          slot="inactive-icon"
-          :src="item.iconPath"
-        ></image>
-        <image
-          style="width: 40rpx; height: 40rpx"
-          class="u-page__item__slot-icon"
-          slot="active-icon"
-          :src="item.selectedIconPath"
-        ></image>
-      </u-tabbar-item>
-    </u-tabbar>
-  </view>
+					<text class="summon">.{{ goodsPrice.split(".")[1] }}</text>
+				</view>
+				<view class="settle" @click="account">{{ i18n.GotoResult }}</view>
+			</view>
+		</view>
+		<u-tabbar :list="list" active-color="#F83224" inactive-color="#333" :value="value1">
+			<u-tabbar-item v-for="(item, idx) in list" @click="click1" :key="idx" :text="item.text">
+				<image style="width: 40rpx; height: 40rpx" class="u-page__item__slot-icon" slot="inactive-icon"
+					:src="item.iconPath"></image>
+
+				<image style="width: 40rpx; height: 40rpx" class="u-page__item__slot-icon" slot="active-icon"
+					:src="item.selectedIconPath"></image>
+			</u-tabbar-item>
+		</u-tabbar>
+	</view>
 </template>
 <script>
-import { mapState } from "vuex";
+	import {
+		mapState
+	} from "vuex";
 
-export default {
-  name: "kj-tabbar",
-  props: {
-    value1: {
-      type: Number,
-      default: 0,
-    },
-    goodsWeight: {
-      type: Number,
-      default: 0,
-    },
-    goodsPrice: {
-      type: String,
-      default: "",
-    },
-    //购物车所有商品
-    goodsList: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-    //购物车选中的商品
-    checkboxValue1: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  data() {
-    return {
-      success: true,
-      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",
-        },
-      ],
-      all: [],
-    };
-  },
-  created() {
-    // if (uni.getStorageSync('tabbar')!=1) {
-    // 	this.value1 = uni.getStorageSync('tabbar')
-    // }
-    // const dom = uni.createSelectorQuery("#tabber")
-  },
-  methods: {
-    account() {
-      console.log(this.checkboxValue1);
-      console.log(this.goodsList);
-      uni.navigateTo({
-        url: "/pageA/order",
-      });
-    },
-    getLabelHeight() {
-      const dom = uni.createSelectorQuery("#tabber");
-      console.log(dom);
-    },
-    // click1(e) {
-    // 	this.value1 = e
-    // 	console.log(e);
-    // 	if (this.value1 == 4) {
-    // 		uni.redirectTo({
-    // 			url: '../../pages/mine/mine'
-    // 		})
-    // 	}
-    // 	if (this.value1 == 0) {
-    // 		uni.redirectTo({
-    // 			url: '../../pages/express/express'
-    // 		})
-    // 	}
-    // 	if (this.value1 == 1) {
-    // 		uni.redirectTo({
-    // 			url: '../../pages/index/index'
-    // 		})
-    // 	}
-    // 	if (this.value1 == 2) {
-    // 		uni.redirectTo({
-    // 			url: '../../pages/shopping/shopping'
-    // 		})
-    // 	}
-    // 	if (this.value1 == 3) {
-    // 		uni.redirectTo({
-    // 			url: '../../pages/cart/cart'
-    // 		})
-    // 	}
-    // 	uni.setStorageSync('tabbar', e)
-    // },
-    checkAll() {
-      this.$emit("allSelect");
-    },
+	export default {
+		name: "kj-tabbar",
+		props: {
+			value1: {
+				type: Number,
+				default: 0,
+			},
+			goodsWeight: {
+				type: Number,
+				default: 0,
+			},
+			goodsPrice: {
+				type: String,
+				default: "",
+			},
+			//购物车所有商品
+			goodsList: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+			//购物车选中的商品
+			checkboxValue1: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		data() {
+			return {
+				success: true,
+				all: [],
+				language: 'zh-CN',
+			};
+		},
+		onLoad() {},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			},
+			list() {
+				var 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",
+					},
+				]
+				list[0].text = this.i18n.border
+				list[1].text = this.i18n.shop
+				list[2].text = this.i18n.chase
+				list[3].text = this.i18n.Shopping
+				list[4].text = this.i18n.mine
+				return list
+			}
+		},
+		created() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			// if (uni.getStorageSync('tabbar')!=1) {
+			// 	this.value1 = uni.getStorageSync('tabbar')
+			// }
+			// const dom = uni.createSelectorQuery("#tabber")
+		},
+		methods: {
+			account() {
+				console.log(this.checkboxValue1);
+				console.log(this.goodsList);
+				uni.navigateTo({
+					url: "/pageA/order",
+				});
+			},
+			getLabelHeight() {
+				const dom = uni.createSelectorQuery("#tabber");
+				console.log(dom);
+			},
+			// click1(e) {
+			// 	this.value1 = e
+			// 	console.log(e);
+			// 	if (this.value1 == 4) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/mine/mine'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 0) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/express/express'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 1) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/index/index'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 2) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/shopping/shopping'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 3) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/cart/cart'
+			// 		})
+			// 	}
+			// 	uni.setStorageSync('tabbar', e)
+			// },
+			checkAll() {
+				this.$emit("allSelect");
+			},
 
-    //
-    cancelAll(value) {
-      if (value == "全选") {
-        return this.all;
-      } else if (value == "取消") {
-        this.all = [];
-      } else {
-        this.all.push(this.i18n.selectall);
-      }
-    },
+			//
+			cancelAll(value) {
+				if (value == "全选") {
+					return this.all;
+				} else if (value == "取消") {
+					this.all = [];
+				} else {
+					this.all.push(this.i18n.selectall);
+				}
+			},
 
-    click1(e) {
-      if (e == 4) {
-        uni.switchTab({
-          url: "../../pages/mine/mine",
-        });
-      }
+			click1(e) {
+				if (e == 4) {
+					uni.switchTab({
+						url: "../../pages/mine/mine",
+					});
+				}
 
-      if (e == 0) {
-        uni.switchTab({
-          url: "../../pages/express/express",
-        });
-      }
+				if (e == 0) {
+					uni.switchTab({
+						url: "../../pages/express/express",
+					});
+				}
 
-      if (e == 1) {
-        uni.switchTab({
-          url: "../../pages/index/index",
-        });
-      }
+				if (e == 1) {
+					uni.switchTab({
+						url: "../../pages/index/index",
+					});
+				}
 
-      if (e == 2) {
-        uni.switchTab({
-          url: "../../pages/shopping/shopping",
-        });
-      }
+				if (e == 2) {
+					uni.switchTab({
+						url: "../../pages/shopping/shopping",
+					});
+				}
 
-      if (e == 3) {
-        uni.switchTab({
-          url: "../../pages/cart/cart",
-        });
-      }
-      // uni.setStorageSync('tabbar', e)
-    },
-  },
-  // created() {},
-  // computed: {
-  // 	...mapState(['config'])
-  // },
-  // watch: {
-  // 	config: {
-  // 		handler(val) {
-  // 			if (val.report_switch == 1) {
-  // 				this.list = [{
-  // 						"iconPath": "/static/images/index.png",
-  // 						"pagePath": "/pages/index/index",
-  // 						"selectedIconPath": "/static/images/index1.png",
-  // 						"text": "首页"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/video.png",
-  // 						"pagePath": "/pages/video/video",
-  // 						"selectedIconPath": "/static/images/video1.png",
-  // 						"text": "视频"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/baobei.png",
-  // 						"pagePath": "/pages/baobei/baobei",
-  // 						"selectedIconPath": "/static/images/baobei1.png",
-  // 						"text": "客户报备"
-  // 					},
-  // 					{
-  // 						"iconPath": "/static/images/mine.png",
-  // 						"pagePath": "/pages/mine/mine",
-  // 						"selectedIconPath": "/static/images/mine1.png",
-  // 						"text": "我的"
-  // 					}
-  // 				]
-  // 			}
-  // 		},
-  // 		deep: true
-  // 	}
-  // }
-};
+				if (e == 3) {
+					uni.switchTab({
+						url: "../../pages/cart/cart",
+					});
+				}
+				// uni.setStorageSync('tabbar', e)
+			},
+		},
+		// created() {},
+		// computed: {
+		// 	...mapState(['config'])
+		// },
+		// watch: {
+		// 	config: {
+		// 		handler(val) {
+		// 			if (val.report_switch == 1) {
+		// 				this.list = [{
+		// 						"iconPath": "/static/images/index.png",
+		// 						"pagePath": "/pages/index/index",
+		// 						"selectedIconPath": "/static/images/index1.png",
+		// 						"text": "首页"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/video.png",
+		// 						"pagePath": "/pages/video/video",
+		// 						"selectedIconPath": "/static/images/video1.png",
+		// 						"text": "视频"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/baobei.png",
+		// 						"pagePath": "/pages/baobei/baobei",
+		// 						"selectedIconPath": "/static/images/baobei1.png",
+		// 						"text": "客户报备"
+		// 					},
+		// 					{
+		// 						"iconPath": "/static/images/mine.png",
+		// 						"pagePath": "/pages/mine/mine",
+		// 						"selectedIconPath": "/static/images/mine1.png",
+		// 						"text": "我的"
+		// 					}
+		// 				]
+		// 			}
+		// 		},
+		// 		deep: true
+		// 	}
+		// }
+	};
 </script>
 
 <style lang="scss" scoped>
-.all {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #444444;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-.bottom {
-  width: 750rpx;
-  height: 100rpx;
-  background: #ffffff;
-  padding: 0 24rpx;
-  box-sizing: border-box;
+	.all {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #444444;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #ffffff;
+		padding: 0 24rpx;
+		box-sizing: border-box;
 
-  .allweight {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 22rpx;
-    color: #333333;
-    line-height: 32rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.allweight {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .sum {
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 400;
-    font-size: 22rpx;
-    color: #333333;
-    line-height: 32rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.sum {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 22rpx;
+			color: #333333;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .summon {
-    font-family: JDZhengHT, JDZhengHT;
-    font-weight: 400;
-    font-size: 24rpx;
-    color: #ff1515;
-    line-height: 30rpx;
-    text-align: left;
-    font-style: normal;
-  }
+		.summon {
+			font-family: JDZhengHT, JDZhengHT;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #ff1515;
+			line-height: 30rpx;
+			text-align: left;
+			font-style: normal;
+		}
 
-  .settle {
-    width: 176rpx;
-    height: 68rpx;
-    background: #f83224;
-    border-radius: 38rpx;
-    font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 28rpx;
-    color: #ffffff;
-    line-height: 68rpx;
-    text-align: center;
-    font-style: normal;
-    margin-left: 20rpx;
-  }
-}
-</style>
+		.settle {
+			width: 176rpx;
+			height: 68rpx;
+			background: #f83224;
+			border-radius: 38rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #ffffff;
+			line-height: 68rpx;
+			text-align: center;
+			font-style: normal;
+			margin-left: 20rpx;
+		}
+	}
+</style>

pageA/chat/chat.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="chat-pages">
-		<u-navbar :border="false" @leftClick="return1">
+		<u-navbar :border="false" >
 			<view class="u-nav-slot" slot="left" style="display: flex;">
+				<u-icon name="arrow-left" @click="return1()" size="20"></u-icon>
 				<image src="@/static/images/index/dianhua.png" mode=""
 					style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
 			</view>
@@ -133,7 +134,7 @@
 		</view>
 		<view class="" style="height: 55rpx;"></view>
 		<!-- <kj-chat></kj-chat> -->
-		<kj-chat :to="user_other_no" :list="changyong_list" :user_other='user_other' @success="getdata"></kj-chat>
+		<kj-chat :user='user' :to="user_other_no" :list="changyong_list" :user_other='user_other' @success="getdata"></kj-chat>
 	</view>
 </template>
 
@@ -164,10 +165,12 @@
 		},
 		onLoad(options) {
 			this.user = options.user_info
-			this.user_other = JSON.parse(decodeURIComponent(options.user_other))
+			if(options.user_other){
+				this.user_other = JSON.parse(decodeURIComponent(options.user_other))
+			}
 			// this.statusheight = uni.getSystemInfoSync().statusBarHeight,
 			this.user_other_no = options.user_other_no
-			console.log(this.user_other);
+			console.log(this.user_other_no);
 			// this.user_other = options.user_other, //用户信息
 			if (uni.getStorageSync('user_no')) {
 				this.user_no = uni.getStorageSync('user_no')
@@ -273,7 +276,6 @@
 				};
 				conn.getHistoryMessages(options).then((res) => {
 						// 成功获取历史消息。
-						console.log('kkkk', res);
 						if (res.isLast) {
 							this.loadText = '已无更多数据';
 						}

pageA/chat/news.vue

@@ -27,6 +27,7 @@
 				<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.shopname}}</view>
+						<view class="name">{{item.lastMessage.ext.user}}</view>
 						<view class="time">
 							{{new Date(item.lastMessage.time).getFullYear()}}-{{new Date(item.lastMessage.time).getMonth() + 1}}-{{new Date(item.lastMessage.time).getDate()}}
 							{{new Date(item.lastMessage.time).toTimeString().substr(0, 8)}}
@@ -74,11 +75,12 @@
 					url: '/pageA/service/service'
 				})
 			},
-			// chat(item) {
-			// 	uni.navigateTo({
-			// 		url: '/pageA/chat/chat?user_other_no=' + item.from
-			// 	})
-			// }  
+			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.from 
+				})
+			}  
 		}
 	}
 </script>

pageA/order.vue

@@ -23,7 +23,7 @@
 				<view class=" "
 					style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
 					<view class="">
-						<text>{{goodinfo.name_cn}}</text>
+						<text class="toptitle">{{goodinfo.name_cn}}</text>
 						<view class="weight">{{sku_info.item}} </view>
 						<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
 					</view>
@@ -65,7 +65,7 @@
 			<view class="bottom">
 				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex;">
 					<view class="u-flex" style="column-gap: 16rpx; ">
-						<view class="" v-for="(item,idx) in swiptlist" :key="idx" @click="">
+						<view class="" v-for="(item,idx) in swiptlist" :key="idx" @click="todetail(item.id)">
 							<image :src="item.image" style="width: 156rpx;height: 156rpx;" mode="">
 							</image>
 							<view class="title" v-if="language =='zh-CN'">
@@ -272,6 +272,11 @@
 			// this.container()
 		},
 		methods: {
+			todetail(id) {
+				uni.reLaunch({
+					url: '/pageA/productdetails?id=' + id
+				})
+			},
 			//正则匹配手机号
 			replacePhoneToStar: function(phone) {
 				if (phone) {
@@ -393,7 +398,7 @@
 							that.unit_price = 0;
 						}
 					} else {
-						goodsum = Number(that.sku_info.discount_price * 100) * Number(that.value * 100) /10000
+						goodsum = Number(that.sku_info.discount_price * 100) * Number(that.value * 100) / 10000
 						if (goodsum > res.free_shipping) {
 							that.sum = 0
 							that.unit_price = 0
@@ -503,6 +508,24 @@
 </script>
 
 <style lang="scss" scoped>
+	.toptitle {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		// font-size: 22rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+		// width: 148rpx;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-line-clamp: 1;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		word-break: break-all;
+	}
+
 	::v-deep .u-status-bar {
 		height: 0 !important;
 	}
@@ -624,6 +647,7 @@
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		text-align: center;
+		word-break: break-all;
 	}
 
 	.wei {
@@ -799,6 +823,7 @@
 				-webkit-line-clamp: 2;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
+				word-break: break-all;
 			}
 
 			.top {

pageA/payorder.vue

@@ -200,6 +200,9 @@
 			confirm() {
 				// console.log(new Date().getTime());
 				if (this.type == "") {
+					console.log(this.balance);
+					console.log(this.sum1);
+					// if (  Number(this.balance)  > Number(this.sum1)) {
 					uni.$u.http
 						.post("/api/order/payment", {
 							order_id: this.orderid,
@@ -220,9 +223,9 @@
 										this.$u.toast('支付成功')
 										console.log('success:' + JSON.stringify(res));
 										setTimeout(() => {
-												// uni.navigateTo({
-												// 	url: "confirm",
-												// });
+											// uni.navigateTo({
+											// 	url: "confirm",
+											// });
 										}, 800);
 									},
 									fail: function(err) {
@@ -240,6 +243,10 @@
 							}
 						})
 						.catch(() => {});
+					// } else {
+					// 	this.$u.toast('余额不足')
+					// }
+
 				} else {
 					uni.$u.http
 						.post("/api/pay", {

pageA/productdetails.vue

@@ -7,7 +7,7 @@
 			<u-navbar :safeAreaInsetTop="true" :placeholder="true">
 				<view class="u-nav-slot u-flex" slot="left" style="display: flex">
 					<view class="u-flex">
-						<u-icon name="arrow-left" size="19" @click="navigateBack()"></u-icon>
+						<u-icon name="arrow-left" size="19" @click="returnindex"></u-icon>
 						<u-tabs :duration="duration" @click="scrollToPosition" :list="list1" lineColor="#fff"
 							:activeStyle="{ color: '#FF1515' }" :inactiveStyle="{
                 color: ' #666666',
@@ -66,7 +66,7 @@
 								<text v-if="language == 'it-IT'" class="tabs">{{ tab.name_ita }}</text>
 							</div>
 						</view>
-						<view class="title">
+						<view class="">
 							<text class="title" v-if="language == 'zh-CN'">
 								{{ goodinfo.name_cn }}
 							</text>
@@ -495,9 +495,15 @@
 			this.guarantee()
 		},
 		methods: {
+			returnindex() {
+				uni.switchTab({
+					url:'/pages/index/index'
+				})
+			},
 			chat() {
 				uni.navigateTo({
-					url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(this.goodinfo.merchant)) +'&user_other_no=' + this.goodinfo.merchant.member.easemob_username
+					url: '/pageA/chat/chat?user_other=' + encodeURIComponent(JSON.stringify(this.goodinfo
+						.merchant)) + '&user_other_no=' + this.goodinfo.merchant.member.easemob_username
 				})
 			},
 			sharea() {
@@ -745,6 +751,7 @@
 		height: 70rpx;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
+		word-break: break-all;
 	}
 
 	.redback {
@@ -817,6 +824,13 @@
 		text-align: left;
 		font-style: normal;
 		margin-top: 16rpx;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
 	}
 
 	.view {
@@ -1138,6 +1152,7 @@
 				text-overflow: ellipsis;
 				white-space: wrap;
 				-webkit-line-clamp: 3;
+				word-break: break-all;
 			}
 
 			.name {

pageA/shoplist.vue

@@ -1,35 +1,60 @@
 <template>
 	<view>
-		<u-tabs lineColor="rgba(0,0,0,0)" :activeStyle="{
+		<u-tabs lineColor="rgba(0,0,0,0)" :current='current' :activeStyle="{
             color: 'rgba(255, 21, 21, 1)',
             fontWeight: 'bold',
             transform: 'scale(1.05)'
         }" :list="list1" @click="click"></u-tabs>
 		<view class="box" style="position: relative;">
 			<view class="u-flex u-row-between">
-				<view @click="current=0" class="u-flex" :style="{color:current==0?'rgba(255, 21, 21, 1)':''}">
+				<view @click="first" class="u-flex" :style="{color:current1==0?'rgba(255, 21, 21, 1)':''}">
 					{{i18n.synthesis}}
 					<view>
 					</view>
-					<u-icon name="arrow-down-fill" color="rgba(255, 21, 21, 1)" size="8"></u-icon>
+
+				</view>
+				<view class="u-flex">
+					<text @click="sale_num" :style="{color:current1==1?'rgba(255, 21, 21, 1)':''}">{{i18n.sell}}</text>
+					<view class="u-flex-column">
+						<u-icon v-if="desc==false && current1==1" name="arrow-up-fill" color="rgba(255, 21, 21, 1)"
+							size="8"></u-icon>
+						<u-icon v-if="(desc==true ) || (desc==false && current1 !=1) " name="arrow-up-fill"
+							size="8"></u-icon>
+						<u-icon
+							v-if="(desc==false && current1 ==1) || (desc==true && current1 !=1) || (desc==false && current1 !=1) "
+							name="arrow-down-fill" size="8"></u-icon>
+						<u-icon v-if="desc==true && current1==1" name="arrow-down-fill" color="rgba(255, 21, 21, 1)"
+							size="8"></u-icon>
+					</view>
 				</view>
-				<text @click="current=1" :style="{color:current==1?'rgba(255, 21, 21, 1)':''}">{{i18n.sell}}</text>
-				<view @click="current=2" class=" u-flex" :style="{color:current==2?'rgba(255, 21, 21, 1)':''}">
+				<view @click="price" class=" u-flex" :style="{color:current1==2?'rgba(255, 21, 21, 1)':''}">
 					<view>{{i18n.Pricea}}</view>
-					<image src="static/images/up.png" style="width: 16rpx;height: 16rpx;" mode=""></image>
+					<!-- <image src="static/images/up.png" style="width: 16rpx;height: 16rpx;" mode=""></image> -->
+					<view class="u-flex-column">
+						<u-icon v-if="desc==false && current1==2" name="arrow-up-fill" color="rgba(255, 21, 21, 1)"
+							size="8"></u-icon>
+						<u-icon v-if="(desc==true ) || (desc==false && current1 !=2) " name="arrow-up-fill"
+							size="8"></u-icon>
+						<u-icon
+							v-if="(desc==false && current1 ==2) || (desc==true && current1 !=2) || (desc==false && current1 !=2) "
+							name="arrow-down-fill" size="8"></u-icon>
+						<u-icon v-if="desc==true && current1==2" name="arrow-down-fill" color="rgba(255, 21, 21, 1)"
+							size="8"></u-icon>
+					</view>
 				</view>
-				<text @click="current=3" :style="{color:current==3?'rgba(255, 21, 21, 1)':''}">≤1kg</text>
+				<text @click="weightty" :style="{color:current1==3?'rgba(255, 21, 21, 1)':''}">≤1kg</text>
 				<text>|</text>
-				<view class="u-flex" :style="{color:current==4?'rgba(255, 21, 21, 1)':''}" @click="shaixuan">
+				<view class="u-flex" :style="{color:current1==4?'rgba(255, 21, 21, 1)':''}" @click="shaixuan">
 					<view style="margin-right: 10rpx;">{{i18n.screen}}</view>
-					<image v-if="current==4" src="static/images/shaixuana.png" style="width: 24rpx;height: 24rpx;"
-						mode=""></image>
+					<image v-if="current1==4" src="static/images/shaixuana.png" style="width: 24rpx;height: 24rpx;"
+						mode="">
+					</image>
 					<image v-else src="static/images/shaixuan.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				</view>
 			</view>
 
 			<liu-waterfall :dataList="data" :column="columns" @click="detail"></liu-waterfall>
-			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current==4">
+			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current1==4">
 				<!-- 价格区间 -->
 				<view class=" title">{{i18n.Pricerange}}</view>
 				<view class="u-flex u-row-between">
@@ -80,7 +105,7 @@
 					{{i18n.yes}}
 				</view>
 				<view class="bottom u-flex" style="margin-top: 58rpx;">
-					<view class="btn1">
+					<view class="btn1" @click="reset">
 						{{i18n.reset}}
 					</view>
 					<view class="btn2" @click="enter">
@@ -98,8 +123,8 @@
 			return {
 				yes: false,
 				shai: false,
+				current1: 0,
 				current: 0,
-				curess: 0,
 				index: '',
 				list1: [],
 				data: [],
@@ -114,15 +139,17 @@
 				brand_id: '', //品牌id
 				price_range_start: '', //价格区间
 				price_range_end: '', //价格区间
-				brandlist: []
+				brandlist: [],
+				static: '', //销售或价格状态
+				desc: true,
+				brand_idone: ''
 			};
 		},
 		onLoad(options) {
 			this.goodsid = options.id
 			this.title = options.title
 			this.parent_id = options.parent_id
-			this.curess = options.index
-			console.log(options.index);
+			this.current = Number(options.index)
 		},
 		onShow() {
 			uni.setNavigationBarTitle({
@@ -133,7 +160,7 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
-			this.brand()
+			// this.brand()
 		},
 		computed: {
 			i18n() {
@@ -141,6 +168,40 @@
 			}
 		},
 		methods: {
+			first(){
+				this.current1=0
+				this.reset()
+			},
+			//重置
+			reset() {
+				this.weight_range_start = ''
+				this.weight_range_end = ''
+				this.brand_id = this.brand_idone //品牌id
+				this.price_range_start = '' //价格区间
+				this.price_range_end = '' //价格区间
+				this.yes = false
+				this.shai = false
+				this.goods(this.goodsid)
+			},
+			//重量筛选
+			weightty() {
+				this.current1 = 3
+				this.weight_range_start = 0
+				this.weight_range_end = 1
+				this.goods(this.goodsid)
+			},
+			sale_num() {
+				this.current1 = 1
+				this.static = 'sale_num'
+				this.desc = !this.desc
+				this.goods(this.goodsid)
+			},
+			price() {
+				this.current1 = 2
+				this.static = 'price'
+				this.desc = !this.desc
+				this.goods(this.goodsid)
+			},
 			enter() {
 				this.shai = false
 				this.goods(this.goodsid)
@@ -204,7 +265,10 @@
 						weight_range_end: this.weight_range_end,
 						brand_id: this.brand_id,
 						price_range_start: this.price_range_start,
-						price_range_end: this.price_range_end
+						price_range_end: this.price_range_end,
+						order: this.static,
+						order_type: this.desc ? 'desc' : 'asc',
+						source: this.yes ? 1 : 0
 					}
 				}).then((res) => {
 					this.data = res.data
@@ -213,24 +277,31 @@
 				})
 			},
 			//品牌列表
-			brand(id) {
+			brand() {
 				uni.$u.http.get('/api/goods/brand', {
 					params: {}
 				}).then((res) => {
-					console.log(res);
 					this.brandlist = res
+					this.brand_id = brandlist[0].id
+					this.brand_idone = brandlist[0].id
 				}).catch(() => {
 
 				})
 			},
 			shaixuan() {
 				this.shai = true,
-					this.current = 4
+					this.current1 = 4
+				this.weight_range_start = ''
+				this.weight_range_end = ''
+				this.desc = true
+				this.brand()
+				this.goods(this.goodsid)
 			},
 			click(item) {
 				console.log('item', item);
-				this.curess = item.index
+				this.current = item.index
 				this.title = item.title
+				this.goodsid = item.id
 				this.goods(item.id)
 				if (this.language == 'en-US') {
 					uni.setNavigationBarTitle({
@@ -254,7 +325,7 @@
 					})
 				}
 			},
-			changei(item,idx) {
+			changei(item, idx) {
 				this.brand_id = item.id
 				this.index = idx
 			}

pageA/subsidy.vue

@@ -317,6 +317,7 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
+		word-break: break-all;
 	}
 
 	.box {

pageB/account.vue

@@ -212,7 +212,7 @@
 	}
 	.topadd {
 		width: 702rpx;
-		height: 278rpx;
+		// height: 278rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 40rpx 24rpx 30rpx;

pageB/end.vue

@@ -251,7 +251,7 @@
 <style lang="scss" scoped>
 	.topname {
 		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
+		font-weight: 600;
 		font-size: 30rpx;
 		color: #222222;
 		line-height: 42rpx;
@@ -321,7 +321,7 @@
 
 		.entrepotname {
 			font-family: PingFangSC, PingFang SC;
-			font-weight: 500;
+			font-weight: 600;
 			font-size: 32rpx;
 			color: #222222;
 			line-height: 44rpx;

pageB/list/list.vue

@@ -126,6 +126,7 @@
 		line-height: 26rpx;
 		text-align: left;
 		font-style: normal;
+		font-weight: 600;
 	}
 
 	.bigtitle {

pageB/orderinfo.vue

@@ -2,7 +2,7 @@
 	<view class="back">
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</text>
-			<!-- <text class="sun">{{i18n.pickpackage}}</text> -->
+			<text class="sun">{{i18n.pickpackage}}</text>
 			<text v-if="orderinfo.status=='imperfect'" class="order"
 				style="color:rgba(248, 50, 36, 1) ;">待完善</text>
 			<text v-if="orderinfo.status=='domestic_undelivered'" class="order"

pages/cart/cart.vue

@@ -770,6 +770,7 @@ export default {
       font-style: normal;
       overflow: hidden;
       text-overflow: ellipsis;
+	  word-break: break-all;
       white-space: nowrap;
       width: 100%;
     }

pages/express/express.vue

@@ -546,6 +546,7 @@
 		line-height: 26rpx;
 		text-align: left;
 		font-style: normal;
+		font-weight: 600;
 	}
 
 	.bigtitle {

pages/index/index.vue

@@ -174,12 +174,12 @@
 							¥{{item.weight}}/kg
 						</text>
 					</view>
-					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
+					<view 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>
 						</view> -->
-						<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
+						<view v-for="(child,idx) in item.label_arr.slice(0,3)" :key="idx" class="taber"
 							style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
 							<text v-if="language =='zh-CN'">
 								{{child.name_cn}}
@@ -223,7 +223,7 @@
 			return {
 				recomlist: [], //推荐列表
 				//顶部分段器
-				list: [],
+				// list: [],
 				current: 1,
 				//tabs
 				list1: [{
@@ -253,6 +253,11 @@
 		computed: {
 			i18n() {
 				return this.$t('index')
+			},
+			list(){
+				var list = []
+				list = [this.i18n.border, this.i18n.shop]
+				return list
 			}
 		},
 		onReachBottom() {
@@ -266,7 +271,7 @@
 			}
 		},
 		onLoad(options) {
-			this.list = [this.i18n.border, this.i18n.shop]
+			
 			// this.seater()
 			if (options.current) {
 				this.current = options.current
@@ -489,7 +494,7 @@
 		margin-bottom: 10rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
-		font-size: 20rpx;
+		font-size: 16rpx;
 		color: #D48700;
 		line-height: 28rpx;
 		text-align: left;
@@ -508,7 +513,8 @@
 		// height: 70rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		-webkit-line-clamp: 2;
+		word-break: break-all;
+		-webkit-line-clamp: 1;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
 	}
@@ -528,6 +534,7 @@
 		width: 124rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
+		word-break: break-all;
 		white-space: nowrap;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

pages/shopping/shopping.vue

@@ -246,6 +246,7 @@
 				-webkit-line-clamp: 2;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
+				word-break: break-all;
 			}
 
 			.tabsa {

uni_modules/liu-waterfall/components/liu-waterfall/liu-waterfall.vue

@@ -83,7 +83,7 @@
 				columnData: [],
 				columnWidth: 0,
 				loading: false,
-				language: ''
+				language: 'zh-CN'
 			};
 		},
 		computed: {

unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss

@@ -1 +1 @@
-.all.data-v-1393e64c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-1393e64c{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .allweight.data-v-1393e64c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-1393e64c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-1393e64c{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-1393e64c{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-13ce84d7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-13ce84d7{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .allweight.data-v-13ce84d7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-13ce84d7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-13ce84d7{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-13ce84d7{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxml

@@ -1 +1 @@
-<view class="content data-v-02584d21" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-02584d21"><scroll-view class="cont_view menu-scroll-view data-v-02584d21" style="{{$root.s0}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" scroll-top="{{scrollTop}}" scroll-into-view="{{itemId}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['swichMenu',[index]]]]]}}" class="menu_item data-v-02584d21" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-02584d21">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-02584d21" style="{{'background:'+(tegColor)+';'}}"></view></block></view></block></scroll-view><scroll-view style="{{$root.s2}}" scroll-top="{{scrollRightTop}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['rightScroll',['$event']]]]]}}" bindscroll="__e" class="data-v-02584d21"><view class="menu_right_view data-v-02584d21"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-02584d21" id="{{'item'+index}}"><view class="menu_right_title data-v-02584d21">{{item.$orig[keyName]}}</view><view class="data-v-02584d21"><slot></slot><scoped-slots-default scroll_list="{{item.$orig[tabbarName]}}" language="{{language}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block></view></scroll-view></view></view>
+<view class="content data-v-5117ff12" style="{{'height:'+(scrollH+'px')+';'}}"><view class="cont data-v-5117ff12"><scroll-view class="cont_view menu-scroll-view data-v-5117ff12" style="{{$root.s0}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" scroll-top="{{scrollTop}}" scroll-into-view="{{itemId}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['swichMenu',[index]]]]]}}" class="menu_item data-v-5117ff12" style="{{item.s1}}" catchtap="__e"><view class="menu_item_name data-v-5117ff12">{{item.$orig[keyName]}}</view><block wx:if="{{current==index&&isTeg}}"><view class="y_teg data-v-5117ff12" style="{{'background:'+(tegColor)+';'}}"></view></block></view></block></scroll-view><scroll-view style="{{$root.s2}}" scroll-top="{{scrollRightTop}}" scroll-y="{{true}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['rightScroll',['$event']]]]]}}" bindscroll="__e" class="data-v-5117ff12"><view class="menu_right_view data-v-5117ff12"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="menu_right_item data-v-5117ff12" id="{{'item'+index}}"><view class="menu_right_title data-v-5117ff12">{{item.$orig[keyName]}}</view><view class="data-v-5117ff12"><slot></slot><scoped-slots-default scroll_list="{{item.$orig[tabbarName]}}" language="{{language}}" class="scoped-ref" bind:__l="__l"></scoped-slots-default></view></view></block></view></scroll-view></view></view>

unpackage/dist/build/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.wxss

@@ -1 +1 @@
-.content.data-v-02584d21{display:flex;flex-direction:column}.content .cont.data-v-02584d21{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-02584d21{height:100%}.content .cont .cont_view .menu_item.data-v-02584d21{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-02584d21{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align:center}.content .cont .cont_view .menu_item .y_teg.data-v-02584d21{width:6rpx;height:40rpx;border-radius:3rpx;position:absolute;left:0;top:50%;z-index:99;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.menu_right_view.data-v-02584d21{padding:24rpx}.menu_right_view .menu_right_item.data-v-02584d21{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-02584d21:last-child{min-height:100vh}.menu_right_title.data-v-02584d21{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;font-weight:700;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden}
+.content.data-v-5117ff12{display:flex;flex-direction:column}.content .cont.data-v-5117ff12{flex:1;display:flex;overflow:hidden}.content .cont .cont_view.data-v-5117ff12{height:100%}.content .cont .cont_view .menu_item.data-v-5117ff12{position:relative;padding:24rpx 12rpx}.content .cont .cont_view .menu_item .menu_item_name.data-v-5117ff12{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden;text-align:center}.content .cont .cont_view .menu_item .y_teg.data-v-5117ff12{width:6rpx;height:40rpx;border-radius:3rpx;position:absolute;left:0;top:50%;z-index:99;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.menu_right_view.data-v-5117ff12{padding:24rpx}.menu_right_view .menu_right_item.data-v-5117ff12{margin-bottom:30rpx}.menu_right_view .menu_right_item.data-v-5117ff12:last-child{min-height:100vh}.menu_right_title.data-v-5117ff12{font-family:PingFangSC,PingFang SC;font-size:28rpx;color:#222;font-weight:700;font-size:28rpx;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:1;overflow:hidden}

unpackage/dist/build/mp-weixin/pageA/balance.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);
+require('./common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageA/balance"],{"0148":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{}}};n.default=u},"2a70":function(e,n,t){"use strict";t.r(n);var u=t("0148"),a=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(r);n["default"]=a.a},5536:function(e,n,t){"use strict";t.r(n);var u=t("cdee"),a=t("2a70");for(var r in a)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(r);var c,f=t("f0c5"),i=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],c);n["default"]=i.exports},5605:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f93b");u(t("66fd"));var a=u(t("5536"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},cdee:function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return u}));var a=function(){var e=this,n=e.$createElement;e._self._c},r=[]}},[["5605","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageA/chat/chat.json

@@ -1,7 +1,10 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
+  "navigationStyle": "custom",
   "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "kj-chat": "/components/kj-chat/kj-chat"
   }
 }