代码合并更新‘

git commit -m 代码合并更新‘

App.vue

@@ -85,7 +85,6 @@
 				}, 6000)
 			}
 
-
 			// #ifdef APP-PLUS
 			//监听uni小程序发送的事件
 			mp.onUniMPEventReceive(ret => {
@@ -149,7 +148,7 @@
 			that.getConfigData()
 
 			//#ifdef APP-PLUS
-             this.checknetwork()
+			this.checknetwork()
 
 			jpushModule.setLoggerEnable(true);
 			jpushModule.initJPushService()
@@ -215,7 +214,7 @@
 
 		},
 		onShow() {
-		
+
 			let that = this
 			// 记录H5和公众号
 			if (this.$store.state.app.token) {
@@ -244,7 +243,7 @@
 			// #endif	
 		},
 		mounted() {
-			
+
 		},
 
 		methods: {
@@ -254,11 +253,11 @@
 				uni.onNetworkStatusChange(function(res) {
 
 					if (res.isConnected) {
-           
+
 						uni.reLaunch({
 							url: '/pages/index/index'
 						})
-                       
+
 					} else {
 
 						uni.showModal({

components/zbpSwiper.vue

@@ -65,14 +65,14 @@
 				type: Boolean,
 				default: false
 			},
-			location_Arr: {
-				type: Object,
-				default: () => ({})
-			},
-			town: {
-				type: String,
-				default: false
-			},
+			// location_Arr: {
+			// 	type: Object,
+			// 	default: () => ({})
+			// },
+			// town: {
+			// 	type: String,
+			// 	default: false
+			// },
 
 		},
 		data() {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.3.8",
-    "versionCode" : 138,
+    "versionName" : "1.4.1",
+    "versionCode" : 141,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -128,26 +128,25 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "uni_modules/guyue-updater/pages/updater",
+			"style": {
+				"app-plus": {
+					"animationDuration": 200,
+					"animationType": "fade-in",
+					"background": "transparent",
+					"backgroundColorTop": "transparent",
+					"bounce": "none",
+					"popGesture": "none",
+					"scrollIndicator": false,
+					"titleNView": false
+				},
+				"backgroundColor": "transparent",
+				"disableScroll": true,
+				"navigationStyle": "custom"
+			}
 		}
-	,{
-    "path": "uni_modules/guyue-updater/pages/updater",
-    "style": {
-        "app-plus": {
-            "animationDuration": 200,
-            "animationType": "fade-in",
-            "background": "transparent",
-            "backgroundColorTop": "transparent",
-            "bounce": "none",
-            "popGesture": "none",
-            "scrollIndicator": false,
-            "titleNView": false
-        },
-        "backgroundColor": "transparent",
-        "disableScroll": true,
-        "navigationStyle": "custom"
-    }
-}
-],
+	],
 	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
@@ -1637,7 +1636,7 @@
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "发布"
-			
+
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
@@ -1653,7 +1652,7 @@
 				"text": "我的"
 			}
 		]
-		
+
 
 
 

pages/moreProject/moreProject.vue

@@ -350,7 +350,7 @@
 								<text class="text">商户设置</text>
 							</view>
 
-							<view class="examine" 	@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
+							<view class="examine" v-if="userInfoData.mer_info.setting_status==1"	@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
 								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
 								</image>
 								<text class="text">交易申请</text>

pages/nongKe/supply_chain/supplier.vue

@@ -14,21 +14,44 @@
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
 							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
 						</view>
-						<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+						<view class="" style="font-size: 40rpx;font-weight: 700;">
 							供销综合云市场
 						</view>
+						<view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
+							:class="{selects:showSelect}">
+							<u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
+								height="33.29rpx"></u--image>
+						</view>
 					</view>
+					<view class="">
 
-					<view style="position: relative;width: 289.14rpx;">
-						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
-							placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
-					<view class='iconfont search-right'
-						@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
-						<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx"
+					<!-- 搜索框 -->
+					<view style="position: relative;width: 289.14rpx;" v-if="showSerch">
+						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
+							placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm"
+							class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+					</view>
+					<!-- 位置 -->
+					<view v-else style="display: flex;align-items: center;" @click="showPicker=!showPicker">
+						<u--image @tap="showSerch=!showSerch" style="margin-right: 30rpx;" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="49rpx" height="49rpx"></u--image>
+						<u--image :showLoading="true" src="/static/images/GXSC/DW1.png" width="50.82rpx"
 							height="50.82rpx"></u--image>
+						<view class="town_name">{{street}}</view>
+					</view>
+				</view>
+				<view class="selected-list" :class="{actSel:showSelect}">
+					<div class="triangle-up"></div>
+					<view class="selected-li">
+						供销综合云市场 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
+								src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image> </text>
+					</view>
+					<view class=""
+						@click="navGoto(`/pages/nongKe/cloud_entrepot/index?street=${street_id}&town=${street}`)">
+						供销综合云商品
 					</view>
 				</view>
 
@@ -36,12 +59,13 @@
 
 			</view>
 			<view class="content">
-				<view style="background-color: red;height: 10px">
+				<view style="height: 10px">
 
 				</view>
 				<view class="hot_serch">
-					<text>热搜:</text> <text @click="hotSerchFn('小张副食')">小张副食</text> <text
-						@click="hotSerchFn('正新酒店')">正新酒店</text>
+					<text>热搜:</text>
+					<text @click="hotSerchFn('小张副食')">小张副食</text>
+					<text @click="hotSerchFn('正新酒店')">正新酒店</text>
 					<text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text>
 					<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text>
 				</view>
@@ -274,6 +298,11 @@
 			<image :src="image"></image>
 			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
 		</u-popup>
+		<view class="">
+			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+				@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		</view>
+
 	</view>
 
 	</view>
@@ -303,6 +332,18 @@
 		configMap
 	} from '@/utils';
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+
+
+
+	import Cache from '@/utils/cache';
 	const app = getApp();
 	export default {
 		components: {
@@ -312,6 +353,9 @@
 		},
 		data() {
 			return {
+				defaInd: [0, 0],
+				columnData: [],
+				showSerch: false,
 				imgList: [
 					"/static/images/GXSC/BBY.png",
 					"/static/images/GXSC/NYSC.png",
@@ -331,6 +375,7 @@
 					"/static/images/GXSC/JDMS.png",
 				],
 				street_id: "",
+				showSelect: false,
 				price: 0,
 				stock: 0,
 				nows: false,
@@ -348,6 +393,8 @@
 				downKey: 0,
 				downStatus: false,
 				menuList: [],
+				street: "",
+				showPicker: false,
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -406,6 +453,7 @@
 		onLoad(options) {
 			// console.log(options);
 			this.street_id = options.street_id
+			this.street = options.townName
 			this.product_type = options.product_type ?? 0
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
@@ -424,7 +472,7 @@
 			supMenuApi().then(res => {
 				this.menuList = res.data
 			})
-
+			this.Area()
 		},
 		computed: {
 			downMenus: function() {
@@ -445,11 +493,103 @@
 			}, mapGetters(['viewColor'])),
 		},
 		methods: {
+			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);
+
+				})
+				this.sotreParam.street_id = e.value[1].code
+				this.street_id = e.value[1].code
+				this.storeMerchantList()
+			},
+			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']);
+					// console.log(res.data, 66666)
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+					console.log(res.data, 9999)
+				});
+			},
+
+			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)
+				}
+			},
+
+			onInputConfirm() {
+
+				this.showSerch = false
+				this.searchSubmit()
+
+			},
+			// 对象转数组
+			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
+			},
+
 			test() {
 				if (this.sotreParam.keyword.length > 3) {
 					this.sotreParam.keyword.slice(0, 3)
 					this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
-					console.log(this.sotreParam.keyword)
 				}
 				// console.log(this.sotreParam.keyword.length)
 			},
@@ -462,6 +602,11 @@
 					url
 				})
 			},
+			navGoto(url) {
+				uni.redirectTo({
+					url
+				})
+			},
 			navGo(id) {
 				uni.navigateTo({
 					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
@@ -644,7 +789,7 @@
 				// console.log(rqData)
 				storeMerchantList(rqData).then(res => {
 					this.count = res.data.count
-					this.storeList = this.storeList.concat(res.data.list)
+					this.storeList = (res.data.list)
 					this.loading = false
 					this.loadingIcon = false
 				})
@@ -667,6 +812,7 @@
 				let that = this;
 				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
 				this.set_where(this.firstKey)
+				this.showSerch = false
 			},
 			// 右侧切换
 			bindRight() {
@@ -674,7 +820,7 @@
 				this.rightBox = true
 			},
 			// 组件确定
-			confirm(data) {
+			confirm1(data) {
 				let arr1 = [],
 					arr2 = []
 				if (data.storeTypeArr.length == 0) {
@@ -737,6 +883,9 @@
 		onPullDownRefresh() {
 			uni.stopPullDownRefresh()
 		},
+		onShow() {
+			this.showSelect = false
+		},
 		//上划加载更多
 		onReachBottom() {
 			if (this.count === this.storeList.length) {
@@ -832,7 +981,7 @@
 				height: auto;
 				background-color: white;
 				padding: 20rpx;
-				border-radius: 20rpx;
+				// border-radius: 20rpx;
 				display: flex;
 				// align-items: center;
 
@@ -873,6 +1022,11 @@
 		}
 	}
 
+	.selects {
+		transform: rotate(180deg);
+	}
+
+
 
 	.search-right.styleType2 .right-text,
 	.search-right.styleType3 .right-text {
@@ -901,6 +1055,16 @@
 		}
 	}
 
+	.town_name {
+		overflow: hidden;
+		white-space: nowrap;
+		/* 设置文本不换行 */
+		text-overflow: ellipsis;
+		max-width: 25vw;
+		font-size: 14px;
+		/* 设置溢出文本为省略号 */
+	}
+
 	.hot_serch {
 		color: #B3B3B3;
 		display: flex;
@@ -1086,6 +1250,43 @@
 		margin-left: 10rpx;
 	}
 
+	.selected-list {
+		padding: 24rpx 14rpx;
+		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+		background-color: #fff;
+		position: absolute;
+		left: 100rpx;
+		font-size: 29.79rpx;
+		opacity: 0;
+		transition: 0.5s;
+		height: 0;
+
+
+		.triangle-up {
+			width: 0;
+			height: 0;
+			border-left: 10rpx solid transparent;
+			border-right: 10rpx solid transparent;
+			border-bottom: 10rpx solid white;
+			position: absolute;
+			top: -10rpx;
+		}
+
+		.selected-li {
+			margin-bottom: 35rpx;
+			color: #F84221;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.actSel {
+		opacity: 1;
+		height: auto;
+		// transform: translateX(100rpx);
+
+	}
+
 	.store-wrapper {
 		margin-top: 235rpx;
 		border-top: 1px solid #F6F6F6;

pages/store/settled/index.vue

@@ -421,7 +421,7 @@
 			//获取商户入驻申请协议
 			shoplist() {
 				agreeiness().then(res => {
-					console.log(res)
+					// console.log(res)
 					this.detail = res.data
 				})
 			},

pages/supply_chains/supply_chains.vue

@@ -36,7 +36,7 @@
 
 			<view class="list">
 				<navigator hover-class="none"
-					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`">
+					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
 					<view class="list-m">
 						<image src="@/static/images/f6.png" mode="aspectFit"></image>
 						<view class="list-title">