Merge pull request 'dev' (#1) from dev into master

Reviewed-on: #1

App.vue

@@ -9,7 +9,9 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	// #ifdef APP-PLUS
-  import { initEvent } from "@/utils/uniMPevent.js";
+	import {
+		initEvent
+	} from "@/utils/uniMPevent.js";
 	let jpushModule = uni.requireNativePlugin("JG-JPush");
 	// #endif
 	import {
@@ -588,4 +590,9 @@
 	/deep/.swiper.dot2 .wx-swiper-dots {
 		right: 130rpx;
 	}
+
+	* {
+		scrollbar-color: #ffffff #f7f7f9;
+		scrollbar-width: thin;
+	}
 </style>

components/payment/index.vue

@@ -82,6 +82,10 @@
 			returnUrl: {
 				type: String,
 				default: ''
+			},
+			sale_type: {
+				type: [Number,String],
+				default: 1
 			}
 		},
 		data() {
@@ -235,7 +239,7 @@
 								icon: 'success'
 							}, {
 								tab: 5,
-								url: goPages + '?status=1'
+								url: goPages + '?status=1&sale_type=' + that.sale_type
 							});
 							break;
 						case 'alipay':
@@ -267,7 +271,7 @@
 									icon: 'success'
 								}, {
 									tab: 5,
-									url: goPages + 'status=1'
+									url: goPages + 'status=1&sale_type=' + that.saleType
 								});
 							}).catch(res => {
 								console.log('测试支付数据无效的catch：' + res.data)
@@ -281,7 +285,7 @@
 											title: '取消支付'
 										}, {
 											tab: 5,
-											url: goPages + '?status=0'
+											url: goPages + '?status=0&sale_type=' + that.sale_type
 										});
 									}
 								}
@@ -306,7 +310,7 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + 'status=1'
+										url: goPages + 'status=1&sale_type=' + that.sale_type
 									});
 								},
 								fail: (e) => {
@@ -319,7 +323,8 @@
 											title: '取消支付'
 										}, {
 											tab: 5,
-											url: goPages + '?status=0'
+											url: goPages + '?status=0&sale_type=' + that
+												.sale_type
 										});
 									}
 								},
@@ -354,7 +359,8 @@
 											icon: 'success'
 										}, {
 											tab: 5,
-											url: goPages + '?status=1'
+											url: goPages + '?status=1&sale_type=' + that
+												.sale_type
 										});
 
 									return that.$util.Tips({
@@ -362,7 +368,8 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + '?status=1'
+										url: goPages + '?status=1&sale_type=' + that
+											.sale_type
 									});
 								},
 								fail: function(e) {
@@ -434,7 +441,8 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + 'status=1'
+										url: goPages + 'status=1&sale_type=' + that
+											.sale_type
 									});
 
 								},

manifest.json

@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-    "versionName" : "2.0.34",
+	"versionName": "2.0.37",
-    "versionCode" : 2034,
+	"versionCode": 2037,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

pages/cloud_warehouse/market/market.vue

@@ -628,7 +628,7 @@
 							long: longitude
 						}).then(res => {
 							let town = res.data.address_reference.town.title
-							let street_id = street_id = res.data.address_reference.town.id
+							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_reference.town.title;
 							this.$store.commit('setAddress', {
 								street_id: street_id,
@@ -637,6 +637,19 @@
 							uni.$emit('getLocation_succees', {
 								street_id,
 							});
+              uni.$emit('changeAddress', {
+                addr:{
+                  address: res.data.address,
+                  location: `${res.data.location.lat},${res.data.location.lng}`
+                },
+                area: res.data.ad_info.adcode,
+                latitude: res.data.location.lat,
+                longitude: res.data.location.lng,
+                street:{
+                  code: street_id,
+                  name: town
+                }
+              })
 							this.where.location = `${latitude},${longitude}`;
 							this.$nextTick(() => {
 								setTimeout(() => {

pages/columnGoods/goods_search/index.vue

@@ -218,22 +218,22 @@
 		},
 		methods: {
       getHistoryList(){
-        userLog({
+        // userLog({
-          type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录
+        //   type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录
-        }).then(res=>{
+        // }).then(res=>{
-          this.historyList = res.data;
+        //   this.historyList = res.data;
-        })
+        // })
-        // try {
+        try {
-        // 	this.historyList = []
+        	this.historyList = []
-        // 	this.tempStorage = []
+        	this.tempStorage = []
-        // 	let arr = uni.getStorageSync('historyList')
+        	let arr = uni.getStorageSync('historyList')
-        // 	if (arr.length > 0) {
+        	if (arr.length > 0) {
-        // 		this.historyList = arr
+        		this.historyList = arr
-        // 	} else {
+        	} else {
-        // 		this.historyList = []
+        		this.historyList = []
-        // 	}
+        	}
-        // 	this.tempStorage = this.historyList
+        	this.tempStorage = this.historyList
-        // } catch (e) {}
+        } catch (e) {}
       },
 			// 清空历史记录
 			remove() {
@@ -245,12 +245,13 @@
 						if (res.confirm) {
 							self.tempStorage = []
 							try {
-								userLogDelete({
+								// userLogDelete({
-                  type: this.isShop ? 2 : 1,
+        //           type: this.isShop ? 2 : 1,
-                }).then(res=>{
+        //         }).then(res=>{
-                  console.log(res);
+        //           console.log(res);
-                })
+        //         })
 								self.historyList = []
+                uni.setStorageSync('historyList', self.historyList);
 							} catch (e) {}
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -292,6 +293,15 @@
 				this.$set(this, 'searchValue', event.detail.value);
 			},
 			searchBut: function() {
+        if(this.searchValue!='') {
+          let t =  this.historyList.findIndex(item=>item.word==this.searchValue);
+          let list = [...this.historyList];
+          if(t!=-1) list.splice(t, 1);
+          list.unshift({
+            word: this.searchValue
+          });
+          uni.setStorageSync('historyList', list);
+        }
 				if (this.back) {
 					return uni.navigateBack({
 						success: () => {

pages/gather/gather.vue

@@ -130,7 +130,7 @@
   }
 </style>
 <template>
-  <view class="gather">
+  <view class="gather" @click.stop="clickWhite">
     <!--顶部定位-->
     <view class="gather-header">
       <view style="height: var(--status-bar-height);"></view>
@@ -182,18 +182,18 @@
       <view class="content">
         <block v-if="nowMenuList.length > 0">
           <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-            <view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)">
+            <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"  @longpress="editFlag = true">
               <image class="icon_img" :src="item.pic" mode="aspectFit">
               </image>
               <!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
-              <view v-if="editFlag" class="icon" style="background-color: red;">隐藏</view>
+              <view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
               <text class="text">{{ item.name }}</text>
             </view>
           </u-transition>
         </block>
         <view class="add-box examine"
           style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
-          @click="editFlag = true">
+          @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
           <view class="add-box-icon"
             style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
             <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
@@ -209,7 +209,7 @@
       </view>
       <view class="content">
         <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          <view class="examine" @click="pushMenu(item)">
+          <view class="examine" @click.stop="pushMenu(item)">
             <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
             <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
             <view class="icon">添加</view>
@@ -524,6 +524,10 @@
           }
         });
       },
+      // 点击空白区域完成添加
+      clickWhite(){
+        if(this.editFlag) this.editFlag = false;
+      }
     }
   };
 </script>

pages/index/index.vue

@@ -521,27 +521,28 @@
 				overflow: false,
 				diyId: 0,
 				preview: false,
-				isSupport: true
+				isSupport: true,
+				isIndexClick: true,
+				scrollTop: 0
 			};
 		},
 
 		onTabItemTap(e) {
-
+			if (this.isIndexClick) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 300
+				});
+			} else {
+				this.isIndexClick = true;
+			}
 		},
 
 		// 滚动监听
 		onPageScroll(e) {
-
+			this.isIndexClick = true;
+			this.scrollTop = e.scrollTop;
 			this.isFixed = e.scrollTop > 40;
-
-			// uni.setTabBarItem({
-			// 	index: 0,
-			// 	text: "123",
-			// 	selectedIconPath: "/static/tabbar_icon/b-a.png"
-			// })
-
-			// this.$forceUpdate();
-
 			if (this.isHeaderSerch) {
 				let isScroll = false
 				isScroll = e.scrollTop > 50
@@ -551,6 +552,20 @@
 			}
 			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
 			uni.$emit('scroll');
+
+			if (e.scrollTop >= 100) {
+				uni.setTabBarItem({
+					index: 0,
+					text: "首页",
+					selectedIconPath: "/static/tabbar_icon/back_a.png"
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 0,
+					text: "首页",
+					selectedIconPath: "/static/tabbar_icon/a-a.png"
+				})
+			}
 		},
 
 		/**
@@ -604,7 +619,8 @@
 			this.activeRouter = '/' + curRoute
 		},
 		onShow() {
-			let that = this
+			let that = this;
+
 			that.isIntegral = uni.getStorageSync('isIntegral')
 			// #ifdef APP-PLUS
 			if (that.appUpdate.openUpgrade == '1') {
@@ -620,6 +636,8 @@
 					that.isScrolled = res[0].top <= -60
 				})
 			})
+			this.isIndexClick = false;
+
 			if (this.isLogin) {
 				this.getUserInfo();
 			}
@@ -627,9 +645,7 @@
 		onHide() {
 			uni.setStorageSync('isIntegral', false)
 		},
-		onReady() {
 
-		},
 		watch: {
 			globalDatas(nVal, oVal) {
 				// #ifdef H5

pages/order_addcart/order_addcart.vue

@@ -180,7 +180,7 @@
 				@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
 		</block>
 		<!-- 组件 -->
-		<addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+		<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
 			@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
 		<Authorize :isShowAuth="isShowAuth"></Authorize>
 		<!--自定义底部tab栏-->
@@ -260,6 +260,7 @@
 				}],
 				tabsCurr: 1,
 				subsecCurr: 0,
+        addcartKey: 0,
 				domain: HTTP_REQUEST_URL,
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
@@ -305,6 +306,7 @@
 				currSku: '',
 				newData: {},
 				activeRouter: '',
+        attrTxt: '',
 				userInfo: {},
 				mer_info: {
 					mer_settlement_agree_status: 0
@@ -511,7 +513,7 @@
 					// that.DefaultSelect(goods)
 					cartProductAttr(id).then(res => {
             if(res.data.attr.length==0)return Toast('此商品为单规格商品');
-						const sku = {}
+            const sku = {};
             res.data.attrValue.forEach((itemn) => {
               if(this.tabsCurr==2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
             	sku[itemn.sku] = itemn;
@@ -526,6 +528,7 @@
 						that.$set(that, 'productValue', sku);
 						let productSelect = sku[that.attrValue];
 						that.isOpen = that.attr.cartAttr = true;
+            this.newVal = sku[goods.productAttr.sku] || Object.keys(sku)[0];
 						that.DefaultSelect(goods)
 					}).catch(err => {
 						return that.$util.Tips({

pages/store/home/index.vue

@@ -2,7 +2,6 @@
 	<view class="store-home">
 		<view class="header">
 			<view style="height: var(--status-bar-height);"></view>
-
 			<view class="head-menu">
 				<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
 				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
@@ -86,10 +85,10 @@
 		</view>
 
 		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
-			<!-- nav的占位 -->
 			<view class="tab-cont"
-				:style="viewColor,{'height':'calc(100vh - '+listHeight + (tabActive == 2?' + 84rpx':'')+' )'}"
+				:style="viewColor,{'height':'calc(100vh - '+(listHeight) + (tabActive == 2?' + 84rpx':'')+' )'}"
 				:class="{noPointer : preview}">
+
 				<!-- 占位 -->
 				<view class="aside-left-placeholder" v-if="tabActive != 2"></view>
 
@@ -151,11 +150,28 @@
 				</view>
 
 				<!-- 首页 -->
-				<view style="margin:0 auto;"
+				<view style="margin:0px auto;"
 					v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
+					<!-- 二级分类 -->
+					<scroll-view :scroll-x="true" class="small-classify" :style="{'width':'calc(100vw - 152rpx)'}"
+						v-if="asideCurr">
+						<view class="second-item-con-wrap">
+							<view class="second-item-con" :style="{'flex-wrap':isChangeSecTabStyle?'wrap':''}">
+								<block v-for="item in secondTabList" :key="item.store_category_id">
+									<view class="small-classify-item"
+										:class="{'small-classify-item-active':secondTabCurr == item.store_category_id?true:false}"
+										@click="onSecondTabChange(item.store_category_id)">
+										{{item.cate_name}}
+									</view>
+								</block>
+							</view>
+							<view class="sanjiaoxing" @click="onChangeSecTabStyle"></view>
+						</view>
+					</scroll-view>
+
 					<!-- 商品 -->
 					<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove"
-						:style="{'width':'calc(100vw - 152rpx)'}">
+						:style="{'width':'calc(100vw - 152rpx)','padding-top':(!!asideCurr?'94rpx' :'')}">
 						<view v-if="isColumn" class="goods column">
 							<view v-for="(item,indx) in goods" :key="indx" class="item" @click="goGoodsDetail(item)">
 								<view class="image" style="width: 180rpx;height: 180rpx;">
@@ -197,7 +213,8 @@
 							<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
 						</view>
 					</view>
-					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
+					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon"
+						:style="{'margin-top':!!asideCurr?'94rpx':''}">
 						<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
 						{{loadTitle}}
 					</view>
@@ -224,7 +241,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="acea-row row-center-wrapper loadingicon">
+					<view class="acea-row row-center-wrapper loadingicon"
+						:style="{'margin-top':!!asideCurr?'94rpx':''}">
 						<text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
 						{{loadTitle}}
 					</view>
@@ -373,7 +391,7 @@
 				navShow: false,
 				navActive: 0,
 				diyActive: 0,
-				tabActive: '', // 底部切换
+				tabActive: 3, // 底部切换
 				isCoupon: 0,
 				keyword: '',
 				order: '',
@@ -470,7 +488,11 @@
 				asideCurr: '',
 				CartCount: 0,
 				navHeight: 0,
-				listTop: 0
+				listTop: 0,
+				mer_type: '', //区分云仓
+				secondTabList: [],
+				secondTabCurr: '', //二级分类
+				isChangeSecTabStyle: false
 			}
 		},
 		computed: {
@@ -527,6 +549,7 @@
 						break;
 					case 7:
 						this.resetParmas();
+						this.getMerClassifly();
 						this.goods = [];
 						this.getGoods();
 						break;
@@ -557,8 +580,9 @@
 				}
 			}
 			// #endif
+			// 店铺详情
 			this.getStore();
-			this.diyData();
+			// this.diyData();
 			shareScence(this.currSpid, this.isLogin);
 
 			this.initHeight();
@@ -579,6 +603,8 @@
 			})
 
 			this.getMerClassifly();
+
+			// 购物车
 			this.getCart();
 		},
 
@@ -617,31 +643,97 @@
 				getCartCounts({
 					sale_type: this.where.sale_type
 				}).then(res => {
-					console.log(res)
 					that.CartCount = res.data[0].count;
 				});
 			},
 
 			// 修改菜单
 			onChangeAsideMenu(e) {
+				// 获取二级分类
+				this.getMerClassifly(e)
 				this.asideCurr = e;
 				this.resetParmas();
 				this.goods = [];
 				this.loadend = false;
+				//重置二级菜单
+				this.secondTabCurr = '';
+				this.isChangeSecTabStyle = false;
+			},
+
+			// 获取分类
+			getMerClassifly(pid) {
+				const param = {
+					mer_type: 2,
+					sale_type: this.where.sale_type,
+					mer_id: this.id,
+					mer_type: '',
+					pid: pid
+				};
+
+				// 云商品(不查询分类下边没有商品的分类)
+				if (this.tabActive == 7) {
+					param.mer_type = 1;
+				}
+
+				//一般商品(不查询分类下边没有商品的分类)
+				if (this.tabActive == 3) {
+					param.mer_type = 2;
+				}
+
+				getCategoryIndexList(param).then(res => {
+					//二级分类
+					if (pid) {
+						this.secondTabList = [{
+							cate_name: '全部',
+							store_category_id: ''
+						}, ...res.data];
+					} else { //一级分类
+						this.asideMenu = [{
+							cate_name: '全部',
+							store_category_id: ''
+						}, ...res.data];
+					}
+					this.getGoods();
+				})
+			},
+
+			// 二级分类
+			onSecondTabChange(e) {
+				this.isChangeSecTabStyle = false;
+				this.secondTabCurr = e;
+				this.resetParmas();
+				this.goods = [];
+				this.loadend = false;
 				this.getGoods();
 			},
 
-			// 获取分类
+			// 商铺底部切换
-			getMerClassifly() {
+			tab: function(param) {
-				getCategoryIndexList({
+				if (param == 9) return uni.switchTab({
-					mer_type: 2,
+					url: "/pages/order_addcart/order_addcart"
-					sale_type: this.where.sale_type
+				});
-				}).then(res => {
+
-					this.asideMenu = [{
+				this.tabActive = param;
-						cate_name: '全部',
+				this.goodsLoading = this.loadend = this.loading = false;
-						store_category_id: ''
+
-					}, ...res.data];
+				// 底部tab切换
-				})
+				this.secondTabCurr = '';
+				this.secondTabList = [];
+				this.asideCurr = '';
+				this.asideMenu = [];
+				this.loadend = false;
+				this.getMerClassifly();
+			},
+
+			// 二级类目样式
+			onChangeSecTabStyle() {
+				this.isChangeSecTabStyle = !this.isChangeSecTabStyle;
+			},
+
+			// 商铺首页滚动 navbar 吸顶
+			scrollHome: function(e) {
+				// uni.$emit('scroll');
+				// this.navShow = e.detail.scrollTop >= 50;
 			},
 
 			navTo(url) {
@@ -862,7 +954,6 @@
 			},
 			// 获取商铺商品
 			getGoods: function() {
-				console.log(2)
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
@@ -870,6 +961,10 @@
 
 				that.goodsLoading = true;
 				that.loadTitle = '';
+
+				if (that.secondTabCurr) //有二级查二级
+					that.where.cate_pid = that.secondTabCurr;
+				else //无二级查一级
 					that.where.cate_pid = that.asideCurr;
 
 				if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => {
@@ -1079,11 +1174,6 @@
 					}
 				})
 			},
-			// 商铺首页滚动 navbar 吸顶
-			scrollHome: function(e) {
-				// uni.$emit('scroll');
-				// this.navShow = e.detail.scrollTop >= 50;
-			},
 
 			goback: function() {
 				uni.navigateBack();
@@ -1095,16 +1185,6 @@
 				});
 			},
 
-			// 商铺底部切换
-			tab: function(param) {
-				console.log(param)
-				if (param == 9) return uni.switchTab({
-					url: "/pages/order_addcart/order_addcart"
-				})
-				this.tabActive = param;
-				this.goodsLoading = this.loadend = this.loading = false
-			},
-
 			resetParmas() {
 				this.navActive = 0;
 				this.where = {
@@ -1112,7 +1192,8 @@
 					keyword: '',
 					page: 1,
 					limit: 30,
-					sale_type: this.where.sale_type
+					sale_type: this.where.sale_type,
+					cate_pid: ''
 				}
 			},
 
@@ -1163,6 +1244,7 @@
 			}
 		},
 		onPageScroll() {
+			this.isChangeSecTabStyle = false;
 			uni.$emit('scroll');
 		},
 		onPullDownRefresh() {
@@ -1177,6 +1259,56 @@
 </script>
 
 <style lang="scss" scoped>
+	.small-classify {
+		position: fixed;
+		left: 152rpx;
+		min-height: 94rpx;
+		background: #fff;
+		z-index: 100;
+		padding: 20rpx 20rpx 10rpx;
+		box-sizing: border-box;
+
+		.second-item-con-wrap {
+			position: relative;
+			display: flex;
+			align-items: center;
+
+			.second-item-con {
+				display: flex;
+				width: 95%;
+				overflow: auto;
+			}
+
+			.sanjiaoxing {
+				position: absolute;
+				right: -2rpx;
+				top: 20rpx;
+				width: 0;
+				height: 0;
+				border: 12rpx solid;
+				border-color: #333 transparent transparent transparent;
+				margin-left: 4rpx;
+			}
+		}
+
+		.small-classify-item {
+			flex-shrink: 0;
+			padding: 10rpx 40rpx;
+			border-radius: 4rpx;
+			font-size: 24rpx;
+			color: #999;
+			background: #F6F6F6;
+			text-align: center;
+			margin-right: 10rpx;
+			margin-bottom: 10rpx;
+		}
+
+		.small-classify-item-active {
+			background: #ECFFE8;
+			color: #40AE36;
+		}
+	}
+
 	.tab-cont {
 		background: #f5f5f5;
 		min-height: 500rpx;
@@ -1191,8 +1323,6 @@
 			position: fixed;
 			left: 0;
 			z-index: 2;
-			display: flex;
-			flex-wrap: wrap;
 			width: 152rpx;
 			overflow-y: auto;
 			background-color: #F4F4F4;
@@ -2225,7 +2355,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		margin-top: 0;
+		margin: 0 auto;
 
 		image {
 			width: 414rpx;

pages/users/order_list/index.vue

@@ -73,7 +73,8 @@
 					<view class='num'>{{orderData.noComment || 0}}</view>
 				</view>
 			</view> -->
-			<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`" hover-class="none">
+			<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`"
+				hover-class="none">
 				<text class="iconfont icon-sousuo"></text>
 				搜索我的订单
 			</navigator>
@@ -345,7 +346,7 @@
 		</view>
 		<!-- <home></home> -->
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
-			:totalPrice='totalPrice'></payment>
+			:totalPrice='totalPrice' :sale_type="sale_type"></payment>
 
 		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
 
@@ -523,9 +524,7 @@
 				toLogin()
 			}
 		},
-		onShow() {
 
-		},
 		onReady: function() {
 			// #ifdef H5
 			this.$nextTick(() => {
@@ -731,11 +730,13 @@
 					uni.hideLoading();
 					if (self.orderStatus == 0) {
 						uni.navigateTo({
-							url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type
+							url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' +
+								this.sale_type
 						})
 					} else {
 						uni.navigateTo({
-							url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type
+							url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' +
+								this.sale_type
 						})
 					}
 				}).catch(() => {

pages/whole_sale/index.vue

@@ -558,7 +558,8 @@
 					deduction_rate: '', //抵扣比例
 					order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
 					rand: 1,
-				}
+				},
+				isIndexClick: true
 			}
 		},
 		computed: {
@@ -571,8 +572,39 @@
 			this.getNav();
 			this.initData();
 		},
-		onPageScroll() {
+
+		onTabItemTap(e) {
+			if (this.isIndexClick) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 300
+				});
+			} else {
+				this.isIndexClick = true;
+			}
+		},
+
+		onShow() {
+			console.log(this.isIndexClick)
+			this.isIndexClick = false;
+		},
+
+		onPageScroll(e) {
 			uni.$emit('scroll');
+
+			if (e.scrollTop >= 100) {
+				uni.setTabBarItem({
+					index: 1,
+					text: "批发",
+					selectedIconPath: "/static/tabbar_icon/back_a.png"
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 1,
+					text: "批发",
+					selectedIconPath: "/static/tabbar_icon/b-a.png"
+				})
+			}
 		},
 		onPullDownRefresh() {
 			this.initData(true, true);

utils/uniMP.js

@@ -339,7 +339,8 @@ const open = (id = null) => {
 			uniMP: true,
 			token: token,
 			avatar: avatar,
-		}
+		},
+    // path: '/pages/index/index?unimp=true'
 	}, (ret) => {
 		uni.hideLoading();
 		if (0 != ret.code) {

utils/uniMPevent.js

@@ -3,7 +3,7 @@ import {
 	uniMPgetLocation,
 	test
 } from "@/utils/uniMPfunction.js"
-console.log(123)
+
 export const initEvent = () => {
 	mp.onUniMPEventReceive(async (ret) => {
 		console.log('小程序事件: ', ret);