界面优化修改

api/requesta.js

@@ -0,0 +1,15 @@
+import request from "@/utils/requesta.js";
+
+export function getCityCloundShop(data) {
+	return request.get("city/get_cloud_shop", data);
+}
+export function cloudWarehouse(data) {
+	return request.get("store/product/cloudWarehouse", data);
+}
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supMenuApi(data) {
+	return request.get('intention/v2/cate', data);
+}

components/Authorize.vue

@@ -28,7 +28,8 @@
 			<view class='bottom flex'>
 				<text class='item' @click='close'>随便逛逛</text>
 				<!-- #ifdef MP -->
-        <button class="item grant" hover-class="none" @tap="getUserProfile"><text class="text">去授权</text></button>
+				<button class="item grant" hover-class="none" @tap="getUserProfile"><text
+						class="text">去授权</text></button>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<button class="item grant" @tap="toWecahtAuth">
@@ -55,12 +56,22 @@
 		getLogo,
 		commonAuth
 	} from '../api/public';
-  import { LOGO_URL, USER_INFO, EXPIRES_TIME } from '../config/cache';
+	import {
-  import { mapGetters } from 'vuex';
+		LOGO_URL,
+		USER_INFO,
+		EXPIRES_TIME
+	} from '../config/cache';
+	import {
+		mapGetters
+	} from 'vuex';
 	import Routine from '../libs/routine';
-  import { configMap } from '@/utils/index';
+	import {
+		configMap
+	} from '@/utils/index';
 	import Auth from '../libs/wechat';
-  import { toLogin } from '../libs/login';
+	import {
+		toLogin
+	} from '../libs/login';
 	// #ifdef MP
 	import editUserModal from '@/components/eidtUserModal/index.vue'
 	// #endif
@@ -198,7 +209,10 @@
 							if (res.data.status == 200) {
 								let time = res.data.result.expires_time - Cache.time();
 								self.$store.commit('UPDATE_USERINFO', res.data.result.user);
-                self.$store.commit('LOGIN', { token: res.data.result.token, time: time });
+								self.$store.commit('LOGIN', {
+									token: res.data.result.token,
+									time: time
+								});
 								self.$store.commit('SETUID', res.data.result.user.uid);
 								Cache.set(EXPIRES_TIME, res.data.result.expires_time, time);
 								Cache.set(USER_INFO, res.data.result.user, time);

components/mentioned.vue

@@ -27,14 +27,19 @@
 
 			</view>
 		</view>
-		<view class='mask' catchtouchmove="true" :hidden='popup.show==false' @tap="closePopup"></view>
+		<view class='mask' style="height: 100vh;" catchtouchmove="true" :hidden='popup.show==false' @tap="closePopup">
+		</view>
 	</view>
 
 </template>
 
 <script>
-	import { goShopDetail } from '@/libs/order.js'
+	import {
-	import { mapGetters } from "vuex";
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		computed: {
 			...mapGetters(['viewColor']),
@@ -63,6 +68,7 @@
 			// 点击关闭按钮
 			closePopup() {
 				this.$set(this.popup, 'show', false);
+				this.$emit("closes")
 			},
 			showPopup() {
 				this.$set(this.popup, 'show', true);
@@ -105,16 +111,20 @@
 		transform: translate3d(0, 100%, 0);
 		transition: all .3s cubic-bezier(.25, .5, .5, .9);
 		max-height: 1000rpx;
+
 		&.on {
 			transform: translate3d(0, 0, 0);
 		}
+
 		.header {
 			position: relative;
 			padding: 40rpx 30rpx;
+
 			.title {
 				color: #282828;
 				font-size: 30rpx;
 			}
+
 			.iconfont {
 				color: #8A8A8A;
 				font-size: 28rpx;
@@ -122,6 +132,7 @@
 				top: 0;
 				right: 0;
 			}
+
 			.icon-guanbi5 {
 				right: 20rpx;
 				color: #8a8a8a;
@@ -132,37 +143,48 @@
 				font-weight: normal;
 			}
 		}
+
 		scroll-view {
 			max-height: 800rpx;
 		}
+
 		.main_count {
 			padding: 0 30rpx 30rpx;
 			max-height: 800rpx;
 			overflow-y: scroll;
+
 			/* #ifndef MP */
 			&.mb90 {
 				margin-bottom: 90rpx;
 			}
+
 			/* #endif */
 			.list {
 				margin-bottom: 40rpx;
 				height: auto;
 				flex-direction: row;
+
 				&:last-child {
 					margin-bottom: 0;
 				}
 			}
+
 			.pro_list {
 				display: flex;
 				flex-direction: row;
-			.picture,.image,uni-image{
+
+				.picture,
+				.image,
+				uni-image {
 					width: 200rpx;
 					height: 200rpx;
 					border-radius: 16rpx;
 				}
+
 				.info {
 					margin-left: 30rpx;
 					position: relative;
+
 					.bottom {
 						display: flex;
 						justify-content: space-between;
@@ -173,6 +195,7 @@
 						bottom: 10rpx;
 						flex-direction: row;
 					}
+
 					.name {
 						color: #282828;
 						font-size: 30rpx;
@@ -180,22 +203,25 @@
 						display: -webkit-box;
 						width: 460rpx;
 					}
+
 					.price {
 						color: var(--view-priceColor);
 						font-size: 26rpx;
 						font-weight: bold;
 						flex-direction: row;
 						align-items: flex-end;
+
 						text {
 							font-size: 34rpx;
 						}
 					}
+
 					.buy-btn {
 						color: #fff;
 						background: var(--view-theme);
-					border-radius: 26rpx;
+						border-radius: 28.04rpx 28.04rpx 28.04rpx 28.04rpx;
-					width: 140rpx;
+						width: 154.21rpx;
-					height: 48rpx;
+						height: 57.83rpx;
 						display: flex;
 						align-items: center;
 						justify-content: center;

components/plantConSwiper/index.vue

@@ -56,8 +56,7 @@
 				videoContext: ''
 			};
 		},
-		created() {
+		created() {},
-		},
 		watch: {
 
 		},
@@ -102,13 +101,15 @@
 		height: 710rpx;
 		position: relative;
 	}
+
 	.product-bg swiper {
 		width: 100%;
 		height: 100%;
 		position: relative;
 	}
+
 	.product-bg .slide-image {
-		width: 100%;
+		width: 100vw;
 		height: 100%;
 		border-radius: 16rpx;
 	}

components/zbpSwiper.vue

@@ -146,6 +146,8 @@
 
 				})
 
+
+
 			},
 			changeHandler(e) {
 				const {

components/zbpSwiperb.vue

@@ -0,0 +1,353 @@
+<template>
+	<view class="zbp-head-wrapper">
+		<view class="color-lump"></view>
+		<view class="bg-img">
+			<img :src="bgColor" alt="">
+		</view>
+
+		<view class="site-box flex_a_c_j_sb" style="padding-top: var(--status-bar-height)">
+
+			<view class="place_wrapper flex_a_c" @click="selectLocation">
+				<view class="iconfont icon-weizhi"></view>
+				<view class="town_name">{{street}}</view>
+			</view>
+			<view class="" style="display: flex;">
+				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+					<view class="iconfont icon-xiaoxi" style="color:#fff;margin-right: 20rpx;"></view>
+				</navigator>
+				<navigator url="/pages/columnGoods/goods_search/index" hover-class="none">
+					<view class="iconfont icon-sousuo" style="font-size: 39rpx;color: white;"></view>
+				</navigator>
+			</view>
+
+		</view>
+		<!-- 搜索栏 -->
+		<!-- <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
+			<view class="flex_a_c">
+				<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+				<input type="text" v-model="keyword" placeholder="搜索产品或店铺" placeholder-style="font-size: 30rpx;"
+					disabled>
+			</view>
+			<button class="search_btn">搜索</button>
+		</navigator> -->
+		<!-- 轮播图 -->
+		<view class="supply_chains-head">
+			<swiper class="swiper " @change="swiperChange" :indicator-dots="swiper.indicatorDots"
+				:autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration"
+				indicator-active-color="#fff">
+				<block v-for="(item,index) in swiper['url']" :key="index">
+					<swiper-item class="swi_item" @click="swiperClick(item)">
+						<!-- <u--image :showLoading="true" :src="item.img" width="750rpx" height="259rpx" mode="aspectFit">
+						</u--image> -->
+						<u--image :showLoading="true" :src="item.img" width="750rpx" height="600rpx">
+						</u--image>
+					</swiper-item>
+				</block>
+			</swiper>
+		</view>
+		<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+	</view>
+</template>
+
+<script>
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+	import {
+		getGeocoder
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from 'vuex'
+	import {
+		Toast
+	} from '../libs/uniApi';
+	import Cache from '@/utils/cache';
+	export default {
+		props: {
+			isSelectPlace: {
+				type: Boolean,
+				default: false
+			},
+			location_Arr: {
+				type: Object,
+				default: () => ({})
+			},
+			town: {
+				type: String,
+				default: false
+			},
+
+		},
+		data() {
+			return {
+				defaInd: [0, 0],
+				street: '',
+
+				showPicker: false,
+				styleConfig: [],
+				columnData: [],
+				homeCombData: [],
+				keyword: '',
+				bgColor: '',
+				swiper: {
+					url: [{
+						img: ''
+					}],
+					indicatorDots: true, // 显示面板指示点
+					vertical: false, // 滑动方向是否为纵向
+					autoplay: true, // 是否自动切换
+					interval: 2000, // 自动切换时间间隔
+					duration: 400 // 滑动动画时长
+				},
+
+			}
+		},
+		watch: {
+			street(nval, val) {
+				this.street = nval
+			}
+		},
+
+		created() {
+
+			this.getBanner()
+			this.Area()
+
+		},
+
+		mounted() {
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新组件的值 
+				this.street = newValue.split(',')[0]
+			});
+		},
+
+		methods: {
+			swiperClick(item) {
+				const url = item.info[1].value
+				uni.navigateTo({
+					url: url
+				})
+			},
+			selectLocation() {
+				this.isSelectPlace ? this.showPicker = true : ''
+
+			},
+
+			confirm(e) {
+
+				this.showPicker = false
+				this.$emit('selectPlce', e)
+				this.$emit('change', e)
+				this.street = e.value[1].name
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+				})
+
+
+
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						picker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+				});
+			},
+
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.bgColor = this.swiper.url[e.detail.current]['img']
+					this.$emit('kkchange', this.bgColor)
+				}
+			},
+
+
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data).sort();
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+			async getBanner(id) {
+				let that = this;
+				const {
+					data
+				} = await getDiy({
+					id: 0
+				})
+				that.styleConfig = that.objToArr(data.value);
+				/* 循环数组得到数据*/
+				that.styleConfig.forEach((item, index, arr) => {
+					if (item.name == 'headerSerch' || item.name == 'homeComb') {
+						if (item.name == 'homeComb') {
+							that.swiper.url = item.swiperConfig.list
+						}
+					}
+				})
+				this.bgColor = this.swiper.url[0].img
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.zbp-head-wrapper {
+		position: relative;
+		// padding-top: 78.95rpx;
+		overflow: hidden;
+		// background-color: green;
+		height: 600rpx;
+
+		// .color-lump {
+		// 	z-index: 1;
+		// 	position: absolute;
+		// 	bottom: -86px;
+		// 	left: 50%;
+		// 	transform: translate(-50%, 0);
+		// 	width: 102%;
+		// 	height: 133px;
+		// 	border-radius: 30px 30px 0 0;
+		// 	background-color: #fff;
+		// }
+
+		.bg-img {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			/* #ifdef MP || APP-PLUS */
+			z-index: -1;
+			/* #endif */
+			/* #ifdef H5 */
+			z-index: 0;
+			/* #endif */
+			z-index: 0;
+			filter: blur(0);
+			overflow: hidden;
+
+			img {
+				width: 100%;
+				height: 100%;
+				filter: blur(30rpx);
+				transform: scale(1.5);
+			}
+		}
+
+		.site-box {
+			margin: 0 auto;
+			width: 750rpx;
+			height: 66.67rpx;
+			margin-top: 30rpx;
+			// margin-bottom: 26.32rpx;
+			position: absolute;
+			z-index: 9999;
+			padding-right: 20rpx;
+
+
+			// 位置
+			.place_wrapper {
+				margin-left: 20rpx;
+				color: #fff;
+				margin-right: 24.56rpx;
+				font-size: 30rpx;
+
+				.town_name {
+					margin-left: 21rpx;
+				}
+			}
+
+			.iconfont {
+				font-size: 35.09rpx;
+			}
+		}
+
+		.my-main {
+			transition: background-color .5s ease;
+		}
+
+		.search_content {
+			margin: 0 auto;
+			width: 724rpx;
+			height: 74rpx;
+			padding: 2px 2px 2px 21.05rpx;
+			border-radius: 175rpx;
+			background: #fff;
+			margin-bottom: 21rpx;
+			position: relative;
+			box-sizing: border-box;
+
+			.icon-sousuo {
+				font-size: 26.32rpx;
+				font-weight: bold;
+				color: #c8c7c6;
+				margin-right: 17.54rpx;
+			}
+
+			.search_btn {
+				color: #fff;
+				width: 105.26rpx;
+				height: 52.63rpx;
+				line-height: 52.63rpx;
+				background: #f84221;
+				border-radius: 100px;
+				font-size: 28.07rpx;
+			}
+		}
+
+		.supply_chains-head {
+			// margin-bottom: 17.54rpx;
+			position: relative;
+			z-index: 2;
+
+			.swiper {
+				width: 750rpx;
+				height: 600rpx;
+				margin: 0 auto;
+				// border-radius: 20rpx 20rpx 20rpx 20rpx;
+				overflow: hidden;
+
+				.swi_item {
+					width: 750rpx;
+					height: 600rpx;
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -252,9 +252,7 @@
 		mounted() {
 			this.getUserInfo()
 
-			uni.onNetworkStatusChange((res) => {
+		
-				console.log(res, res.networkType)
-			});
 			this.selfLocation()
 			// #ifdef  H5
 			// 监听页面滚动事件

pages/nongKe/cloud_entrepot/index.vue

@@ -177,7 +177,6 @@
 											height="400.09rpx"></u--image>
 										<view class="" style="text-align: center;">
 											暂无商品
-
 										</view>
 									</view>
 								</view>
@@ -244,17 +243,84 @@
 		</view>
 		<view class="empty" style="" v-else>
 			<view style="height: var(--status-bar-height);"></view>
+			<view style="padding: 10rpx;">
+				<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+					@click='goBack'></u--image>
+			</view>
 			<view class="info">
+
 				<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
 					height="400.09rpx"></u--image>
 				<view class="" style="text-align: center;">
-					暂无商家
+					当前区域暂无云仓
-
+				</view>
 			</view>
 		</view>
 
+
+
+		<!-- 多规格购物车 -->
+		<view class="" style="z-index: 9999;">
+			<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
+				<view class="sku">
+					<view class="sku_head">
+						<view class="sku_head_l">
+							<u--image :showLoading="true" src="/static/images/BG.png" width="200.09rpx"
+								height="200.09rpx"></u--image>
+						</view>
+						<view class="sku_head_r">
+							<view class="sku_goods_tit">
+								fsdfsdfsdfffffffff
+							</view>
+							<view class="">
+								<view class="sku_goods_price">
+									79.00
+								</view>
+								<view class="sku_goods_num">
+									库存:999
+								</view>
+							</view>
+						</view>
 					</view>
 
+
+					<view class="sku_size">
+						<view class="">
+							尺码
+						</view>
+						<view class="">
+							<text>大号</text>
+						</view>
+					</view>
+					<view class="sku_num">
+						<view class="">
+							数量
+						</view>
+						<view class="">
+							<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
+						</view>
+					</view>
+					<view class="skuaddcart">
+
+						加入购物车
+
+					</view>
+
+				</view>
+			</u-popup>
+		</view>
+
+
+
+
+
+
+
+
+
+
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+		</authorize>
 		<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
 		</view>
 	</view>
@@ -266,7 +332,7 @@
 	import {
 		cloudWarehouse,
 		getCityCloundShop
-	} from '@/api/api.js'
+	} from '@/api/requesta.js'
 	import {
 		Toast
 	} from '@/libs/uniApi';
@@ -284,17 +350,26 @@
 	import {
 		postCartAdd,
 	} from '@/api/store.js';
+	import authorize from '@/components/Authorize';
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
+		components: {
+			authorize,
+		},
 		data() {
 			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
 			return {
+				skuNumber: 0,
+				showcartpop: false,
 				trnList: [],
 				act_cart: false,
 				appInfo: {},
 				pocls: "",
 				type: "",
 				act_swiper: "",
-				current: 1,
+				current: 3,
 				goodsNum: 0,
 				goodsList: [],
 				isEmpty: false,
@@ -315,6 +390,7 @@
 				page_num: 1,
 				act_img: "",
 				cartTagInfo: {},
+				isAuto: false,
 				actList: [{
 					tit: '综合',
 					act: "",
@@ -331,11 +407,16 @@
 				}],
 				status: "loadmore",
 				flag: false,
+				isShowAuth: false, //是否隐藏授权
 
 			}
 		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor', 'uid']),
+		},
+		// ...mapGetters(['isLogin', 'viewColor', 'uid']),
 		onLoad(e) {
-			this.cartFn()
+			// this.cartFn()
 			this.appInfo = this.$appInfo.safeAreaInsets
 			this.winHeight = this.$appInfo.windowHeight
 			this.street_code = e.street
@@ -346,6 +427,7 @@
 		onShow() {
 			this.cartFn()
 		},
+		
 		// 分页
 		onReachBottom() {
 			if (this.flag || !this.goodsList.length) return
@@ -364,6 +446,12 @@
 				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
 					this.status = "nomore"
 					this.flag = false
+				} else {
+					if (res.data.list.length == 0) {
+						this.status = "nomore"
+						return
+					}
+					this.goodsList = this.goodsList.concat(res.data.list)
 				}
 			})
 			// this.getList().then(res => {
@@ -427,6 +515,23 @@
 
 		// },
 		methods: {
+			valChange(e) {
+				this.valChange = e
+			},
+			closecartpop() {
+				this.showcartpop = false
+			},
+			opencartpop() {
+				this.showcartpop = true
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
 			clickSwiperFn(i) {
 				// console.log(i)
 				this.current = i
@@ -521,6 +626,14 @@
 
 			},
 			addcart(item, i) {
+				// this.showcartpop = true
+				// return
+				// console.log(this.isLogin)
+				if (!this.isLogin) {
+					this.isAuto = true;
+					this.isShowAuth = true
+					return
+				}
 
 				let data = {
 					cart_num: 1,
@@ -628,6 +741,39 @@
 		}
 	}
 
+	.sku {
+		padding: 20rpx;
+
+		.sku_head {
+			display: flex;
+
+			.sku_head_r {
+				margin-left: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				flex-direction: column;
+			}
+
+			// justify-content;
+		}
+
+		.sku_num {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.skuaddcart {
+			width: 50vw;
+			background-color: #FEAB00;
+			margin: 0 auto;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			color: white;
+			border-radius: 80rpx;
+		}
+	}
+
 	.flags {
 		background-color: red;
 		z-index: 99999999;
@@ -951,7 +1097,7 @@
 
 	.card {
 		width: 720rpx;
-		z-index: 999999;
+		z-index: 99;
 		// margin:auto;
 		left: 50%;
 		transform: translateX(-50%);

pages/nongKe/supply_chain/supplier.vue

@@ -37,7 +37,7 @@
 			</view>
 			<view class="content">
 				<view style="background-color: red;height: 10px">
-					asdasd
+
 				</view>
 				<view class="hot_serch">
 					<text>热搜:</text> <text @click="hotSerchFn('小张副食')">小张副食</text> <text
@@ -283,8 +283,10 @@
 	import {
 		storeMerchantList,
 		getGeocoder,
-		supMenuApi
 	} from '@/api/store.js';
+	import {
+		supMenuApi
+	} from '@/api/requesta.js';
 	import recommend from './component/recommend';
 	import rightSlider from './component/rightSlider';
 	import {

pages/nongKe/supply_chain/supplierA.vue

@@ -274,9 +274,12 @@
 	import {
 		storeMerchantList,
 		getGeocoder,
-		supMenuApi,
+
 		supAgoodsApi
 	} from '@/api/store.js';
+	import {
+		supMenuApi,
+	} from '@/api/requesta.js';
 	import recommend from './component/recommend';
 	import rightSlider from './component/rightSlider';
 	import {

pages/plantGrass/plant_detail/index.vue

@@ -3,8 +3,8 @@
 
 
 
-		<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false"
+		<view v-if="followDetail != null && followDetail" class="main" :class="{off_scoll:flag}"
-			style="padding-top: var(--status-bar-height);;">
+			@click.stop="showManage = false" style="padding-top: var(--status-bar-height);;">
 			<view v-if="followDetail.status != 1" class="approval_status">
 				<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
 					<view class="status_title">
@@ -202,7 +202,8 @@
 						<text>暂无评论，快去抢沙发吧~</text>
 					</view>
 
-				<view v-if="followDetail.status == 1 && followDetail.relevance.length<=0" class="release_bar acea-row">
+					<view v-if="followDetail.status == 1 && followDetail.relevance.length<=0"
+						class="release_bar acea-row">
 						<view class="input_count" :class="{input_reply:content}">
 							<form @submit="submitComment">
 								<input type="text" :placeholder="placeholder"
@@ -227,14 +228,15 @@
 						</view>
 					</view>
 
-					<view v-if="followDetail.status == 1&& followDetail.relevance.length>0" class="release_bar acea-row">
+					<view v-if="followDetail.status == 1&& followDetail.relevance.length>0"
+						class="release_bar acea-row">
 
 						<view class="shopp" @click="openMore(followDetail)" style="margin-top: 10rpx">
 							<view class="shopp-img">
 								<image src="@/static/images/shopp.png" mode=""></image>
 							</view>
 							<view class="shopp-txt">
-								商品 (2)
+								商品 ({{followDetail.relevance.length}})
 							</view>
 						</view>
 
@@ -265,8 +267,8 @@
 			</view>
 		</view>
 		<!-- 他提到的宝贝弹窗 -->
-		<mentioned ref="mentioned" v-if="followDetail" @close="close" :list="followDetail.relevance"
+		<mentioned ref="mentioned" v-if="followDetail" @close="close" @closes="flag=false"
-			:uid="followDetail.uid"></mentioned>
+			:list="followDetail.relevance" :uid="followDetail.uid"></mentioned>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- 绑定手机号 -->
 		<uni-popup ref="bindmobile" type="bottom">
@@ -277,8 +279,13 @@
 			<view class="" style="background-color: #fff;height: 154rpx ;">
 				<view class="input_count1" :class="{input_reply:content}">
 					<form @submit="submitComment">
-						<input type="text" class="count1" :placeholder="placeholder" placeholder-style="color: #999999; font-size: 26rpx;"
+						<view class="" style="display: flex;padding: 0 20rpx;box-sizing: border-box;">
-							v-model="content" :focus="focus" @confirm.stop="submitComment()" cursorSpacing={20}>
+							<input type="text" class="count1" :placeholder="placeholder"
+								placeholder-style="color: #999999; font-size: 26rpx;" v-model="content" :focus="focus"
+								@confirm.stop="submitComment()" cursorSpacing={20}>
+							<button class="send1" @click.stop="submitComment">发送</button>
+						</view>
+
 					</form>
 				</view>
 			</view>
@@ -336,6 +343,7 @@
 		},
 		data() {
 			return {
+				flag: false,
 				open_grass: openPlantGrass,
 				followDetail: null,
 				commList: [], //评论列表
@@ -712,10 +720,12 @@
 			/*查看提到的宝贝*/
 			openMore(item) {
 				this.$refs.mentioned.showPopup()
+				this.flag = true
 			},
 			close() {
 				this.$refs.mentioned.closePopup()
 				this.$refs.bindmobile.close()
+				this.flag = false
 			}
 		},
 		onReachBottom() {
@@ -1280,6 +1290,7 @@
 			font-size: 32rpx;
 		}
 	}
+
 	.input_count1 {
 
 		height: 70rpx;
@@ -1297,6 +1308,7 @@
 		}
 
 	}
+
 	.release_bar {
 		align-items: center;
 		width: 100%;
@@ -1403,4 +1415,24 @@
 			font-size: 26rpx;
 		}
 	}
+
+	.send1 {
+		font-size: 26rpx;
+		color: #ffffff;
+		// padding: 12rpx 45rpx;
+		background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+		border-radius: 30rpx;
+		text-align: center;
+		width: 150rpx;
+		line-height: 70rpx;
+		margin-left: 20rpx;
+
+		// height: ;
+	}
+
+	// 禁止滚动
+	.off_scoll {
+		height: 100vh;
+		overflow: hidden;
+	}
 </style>

pages/store/settled/index.vue

@@ -102,6 +102,19 @@
 							</view>
 						</view>
 					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name businessBox">社会信用代码</text>
+									<input type="text" maxlength="30" placeholder="请输入社会信用代码"
+										v-model="merchantData.social_credit_code" @input="validateBtn"
+										placeholder-class='placeholder' />
+									
+								</view>
+							</view>
+						</view>
+					</view>
 					<!-- <view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">是否农贸市场</text>
@@ -230,7 +243,8 @@
 					enterprise_name: "",
 					user_name: "",
 					phone: "",
-					classification: ''
+					classification: '',
+					social_credit_code: '',
 				},
 				validate: false,
 				successful: false,
@@ -374,6 +388,7 @@
 						this.merchantData.enterprise_name = resData.mer_name
 						this.merchantData.user_name = resData.name
 						this.merchantData.phone = resData.phone
+						this.merchantData.social_credit_code=resData.social_credit_code
 						this.merchantData.classification = resData.merchant_category_id
 						this.merchantData.mer_type = resData.mer_type_id
 						this.area_id=resData.area_id
@@ -594,6 +609,7 @@
 						mer_name: that.merchantData.enterprise_name,
 						name: that.merchantData.user_name,
 						code: that.merchantData.yanzhengma,
+						social_credit_code: that.merchantData.social_credit_code,
 						merchant_category_id: that.merchantData.classification,
 						mer_type_id: that.merchantData.mer_type,
 						mer_storeType:this.mer_storeType,
@@ -666,6 +682,9 @@
 				if (!value.enterprise_name) return that.$util.Tips({
 					title: '请输入企业名称'
 				});
+				if (!value.social_credit_code) return that.$util.Tips({
+					title: '请输入统一社会信用代码'
+				});
 				if (!value.user_name) return that.$util.Tips({
 					title: '请输入姓名'
 				});

pages/trading_hall/transfer_goods/index.vue

@@ -319,6 +319,8 @@
 		},
 		onLoad(options) {
 			// uni.hideTabBar()
+			// console.log(this.isLogin, "sdfsdkfhjsdhgfsdf")
+			// return
 			this.id = options.id;
 			this.type = options.gtype
 

store/modules/app.js

@@ -117,7 +117,7 @@ const actions = {
 		} else {
 			apptype = 1
 		}
-
+console.log(os)
 		Appversion({
 			version: os.appWgtVersion,
 			type: apptype

utils/requesta.js

@@ -0,0 +1,76 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+	HTTP_REQUEST_URL,
+	HEADER,
+	TOKENNAME
+} from '@/config/app';
+import {
+	checkLogin
+} from '../libs/login';
+import store from '../store';
+
+
+
+/**
+ * 发送请求
+ */
+function baseRequest(url, method, data, {
+	noAuth = false,
+	noVerify = false
+}) {
+	let Url = HTTP_REQUEST_URL,
+		header = HEADER;
+
+
+
+	if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
+
+	return new Promise((reslove, reject) => {
+		uni.request({
+			url: Url + '/api/' + url,
+			method: method || 'GET',
+			header: header,
+			data: data || {},
+			success: (res) => {
+				// #ifdef APP-PLUS
+				// console.log('app', Url + '/api/' + url, res.data);
+				// #endif
+				if (noVerify)
+					reslove(res.data, res);
+				else if (res.data.status == 200)
+					reslove(res.data, res);
+				else if ([410000, 410001, 410002, 40000].indexOf(res.data.status) !== -1) {
+
+					reject(res.data);
+				} else if (res.data.status == 501) {
+					uni.reLaunch({
+						url: '/pages/error/index'
+					})
+					reject(res.data);
+				} else
+					reject(res.data.message || '系统错误');
+			},
+			fail: (message) => {
+				reject('请求失败');
+			}
+		})
+	});
+}
+
+const request = {};
+
+['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => {
+	request[method] = (api, data, opt) => baseRequest(api, method, data, opt || {})
+});
+
+
+
+export default request;