提交

androidPrivacy.json

@@ -1,5 +1,5 @@
 {
-    "version" : "6.0.0",
+    "version" : "7.0.0",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
     "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的位置信息、设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://kdocs.cn/l/cfk2qmBlh9Wt\">《服务协议》</a>和<a href=\"https://kdocs.cn/l/cfk2qmBlh9Wt\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",

components/listcomponent.vue

@@ -90,14 +90,19 @@ export default {
 	},
 	// 触底加载更多
 	onReachBottom() {
-		if (this.listParams.page < this.lastPage) {
-			this.listParams.page += 1;
-			this.getGoodsList();
-		}
+		// console.log("触底了")
+		// if (this.listParams.page < this.lastPage) {
+		// 	this.listParams.page += 1;
+		// 	this.getGoodsList();
+		// }
 	},
 	props:{
 		typeId:{
 			type:Number
+		},
+		isBottom:{
+			type:Boolean,
+			default:false
 		}
 	},
 	watch:{
@@ -108,6 +113,18 @@ export default {
 				this.getGoodsList();
 			}
 		},
+		isBottom:{
+			handler:function(newV){
+				// this.listParams.category_id = newV
+				// this.getGoodsList();
+				console.log(newV,"liudan")
+				console.log("触底了")
+				if (this.listParams.page < this.lastPage) {
+					this.listParams.page += 1;
+					this.getGoodsList();
+				}
+			}
+		}
 		
 	},
 	mounted() {
@@ -202,9 +219,11 @@ export default {
 					that.isEmpty = !that.goodsList.length;
 					that.lastPage = res.data.last_page;
 					that.loadStatus = that.listParams.page < res.data.last_page ? 'loadmore' : 'nomore';
-					that.tempList = res.data.data;
+					// that.tempList = res.data.data;
+					that.tempList.push(...res.data.data);
 					// that.splitData();
 				}
+				this.$emit('isBottomHandle',false)
 			});
 		}
 	}

components/shopro-auth-modal/shopro-auth-modal.vue

@@ -284,11 +284,13 @@
 			<view v-if="authType === 'accountLogin' || authType === 'smsLogin'"
 				class="auto-login-box u-flex u-row-center u-col-center">
 				<!-- 微信 -->
-				<!-- <button v-if="['App', 'wxOfficialAccount', 'wxMiniProgram'].includes(platform)" class="u-reset-button"
+				<!-- #ifdef MP-WEIXIN -->
+				<button v-if="['App', 'wxOfficialAccount', 'wxMiniProgram'].includes(platform)" class="u-reset-button"
 					open-type="getPhoneNumber" @getphonenumber="thirdLogin('wechat', $event)"
 					@tap="thirdLogin('wechat')">
 					<image class="auto-login-img" :src="$IMG_URL + '/imgs/auto_login_wx.png'"></image>
-				</button> -->
+				</button>
+				<!-- #endif -->
 				<!-- 支付宝 -->
 				<!-- <image
 					v-if="['App', 'alipayMiniProgram', 'H5'].includes(platform)"
@@ -311,10 +313,11 @@
 					<view class="agreement-text tcp-text u-flex u-col-center">
 						我已阅读并遵守
 						<view class="tcp-text u-flex u-col-center">
+							<!-- initShop.user_protocol || 0 -->
 							<view @tap.stop="
 								$Router.push({
 									path: '/pages/public/richtext',
-									query: { id: initShop.user_protocol || 0 }
+									query: { id: 4 }
 								})
 							">
 								《用户协议》

components/shopro-mini-card/shopro-mini-card.vue

@@ -1,12 +1,12 @@
 <template>
-	<view class="goods-box u-flex u-col-top" @tap="click">
+	<view class="goods-box u-flex u-col-top" @tap="click" :style="{'width':special?'calc(100vw - 60rpx)':'auto'}">
 		<view class="goods__tag" v-show="tag">
 			<image class="tag-img" :src="tag"></image>
 		</view>
 		<image class="goods_img"  lazy-load fade-show :src="image" mode="aspectFill"></u-image>
 		<view class="u-m-l-20" style="width: calc(100% - 180rpx);height:159rpx;display: flex;flex-direction: column;justify-content: space-between;">
 			<view class="goods-title u-ellipsis-2">{{ title }}</view>
-			<view v-if="subtitle" class="describe-text u-m-b-10 u-ellipsis-1">{{ subtitle }}</view>
+			<view v-if="subtitle" class="describe-text u-m-b-10 u-ellipsis-2">{{ subtitle }}</view>
 			<slot name="describe"></slot>
 			<slot name="cardBottom">
 				<view class="u-flex u-col-bottom font-OPPOSANS">
@@ -68,6 +68,10 @@ export default {
 		number: {
 			type: Number,
 			default: 0
+		},
+		special:{
+			type:Boolean,
+			defalut:false
 		}
 	},
 	computed: {},
@@ -83,6 +87,7 @@ export default {
 <style lang="scss">
 .goods-box {
 	position: relative;
+	// width: calc(100vw - 60rpx);
 	.goods__tag {
 		position: absolute;
 		top: 0;
@@ -109,6 +114,8 @@ export default {
 		font-size: 24rpx;
 		// width: 450rpx;
 		color: #a8700d;
+		white-space: normal;
+		width: 100%;
 	}
 
 	.price {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "蓝鲸鲜森",
     "appid" : "__UNI__EDA2611",
     "description" : "蓝鲸鲜森",
-    "versionName" : "6.0.0",
-    "versionCode" : 600,
+    "versionName" : "7.0.0",
+    "versionCode" : 700,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {

pages/index/category/two-catgory.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content_box">
+	<view class="content_box" :style="{'height':`calc(100% - ${statusBarHeight*2}rpx - 20rpx - 64rpx)`}">
 		<view style="display: flex;align-items: center;">
 			<view style="flex: 1;">
 				
@@ -26,10 +26,6 @@
 			  </view>
 			    
 			</wyb-drop-down>
-			<!-- <view @click="zhankai" class="zhankai">
-				<text>{{scroll?'展':"收"}}</text>
-				<text>{{scroll?'开':"起"}}</text>
-			</view> -->
 		</view>
 		<view class="u-flex u-col-center wrapper-box">
 			<view class="scroll-box" style="background-color: #F6F6F6;">
@@ -47,7 +43,7 @@
 				</scroll-view>
 			</view>
 			<view style="height: 100%;width: 100%;">
-				<scroll-view scroll-y class="scroll-box" enable-back-to-top scroll-with-animation>
+				<scroll-view scroll-y class="scroll-box" enable-back-to-top scroll-with-animation :lower-threshold="10" @scrolltolower="scrolltolowerHandle">
 					<view class="right" style="width: calc(100vw - 200rpx);" v-if="categoryData.length">
 						<!-- <image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" lazy-load mode="aspectFill"></image> -->
 					<!-- 	<view class="type-box u-flex u-col-center u-row-center">
@@ -77,7 +73,7 @@
 							></shopro-empty>
 							<view class="hack-tabbar"></view>
 						</view> -->
-						<goodsList :typeId="listId"></goodsList>
+						<goodsList :typeId="listId" ref="goodList" :isBottom="isBottom" @isBottomHandle="isBottomHandle"></goodsList>
 					</view>
 					
 				</scroll-view>
@@ -107,6 +103,7 @@ export default {
 			statusBarHeight: 20,/* 状态栏高度 */
 			navBarHeight: 45,/* 导航栏高度 */
 			windowWidth: 375,/* 窗口宽度 */
+			isBottom:false
 		};
 	},
 	computed: {},
@@ -135,6 +132,13 @@ export default {
 		// #endif
 	},
 	methods: {
+		scrolltolowerHandle(){
+			console.log("tytyty")
+			this.isBottom = true
+		},
+		isBottomHandle(val){
+			this.isBottom = val
+		},
 		showHandle(val){
 			console.log("yuyu",val)
 			this.$emit('isDrop',val)
@@ -154,6 +158,8 @@ export default {
 					}
 				})
 			})
+			this.$refs.goodList.listParams.page = 1
+			this.$refs.goodList.tempList = []
 			this.$refs.swiper.getjump(i,firstIndex,secondIndex)
 		},
 		catagoryClick(i){
@@ -162,6 +168,8 @@ export default {
 			// })
 			// this.onType(index)
 			console.log(i,"gygy")
+			this.$refs.goodList.listParams.page = 1
+			this.$refs.goodList.tempList = []
 			this.selectedItem = i
 			this.twoData = i.children
 			if(this.twoData.length>0){
@@ -189,6 +197,8 @@ export default {
 		onType(item) {
 			console.log(item)
 			this.listId = item.id;
+			this.$refs.goodList.listParams.page = 1;
+			this.$refs.goodList.tempList = []
 		},
 		// 路由跳转
 		jump(path, parmas) {

pages/index/components/sh-hot-goods.vue

@@ -3,7 +3,7 @@
 	<view class="hot-goods u-m-b-10 u-p-x-16">
 		<view style="display:flex;justify-content: space-between;align-items: center;margin-left:-16rpx;padding: 37rpx 0;">
 			<text style="color: #2E2E2E;font-size:34rpx;font-weight: bold;border-left:12rpx solid #17C161;padding-left:34rpx;">精选热卖</text>
-			<text style="font-size: 24rpx;color: #999999;">查看更多>></text>
+			<text style="font-size: 24rpx;color: #999999;" @click="getMore">查看更多>></text>
 		</view>
 		<view class="u-waterfall" v-if="goodsType === 1">
 			<view id="u-left-column" class="u-column">
@@ -139,6 +139,11 @@ export default {
 				}, this.addTime);
 			}
 		},
+		getMore(){
+			uni.navigateTo({
+				url:"/pages/goods/list"
+			})
+		},
 		clear() {
 			this.leftList = [];
 			this.rightList = [];

pages/index/user/userinfo-card.vue

@@ -34,7 +34,7 @@
 								</view>
 								<view class="">
 									<text class="user-name u-ellipsis-1">{{ userInfo.nickname || '请登录~' }}</text>
-									<view class="id">
+									<view class="id" v-if="userInfo.nickname">
 										用户ID：{{userInfo.id}}
 									</view>
 								</view>

pages/order/confirm.vue

@@ -1155,7 +1155,7 @@ export default {
 
       function getTimeRange() {
         const nowHours = new Date().getHours();
-        return timeRange.filter((item) => item.split(":")[0] > nowHours);
+        return timeRange.filter((item) => item.split(":")[0] > nowHours+1);
       }
 
       let selectDays = []
@@ -1194,6 +1194,7 @@ export default {
 	  if(selectDays[0].timeRange.length === 0) {
 		  selectDays.shift();
 	  }
+	  console.log(selectDays,"uuu")
       this.checkTime = selectDays;
     },
 

pages/user/address/edit.vue

@@ -24,7 +24,7 @@
 					<u-input type="select" v-model="model.area_text" :select-open="showSelect" placeholder="请选择地区" @click="showSelect = true"></u-input>
 				</u-form-item> -->
 				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="小区:" prop="community_text">
-					<u-input type="select" v-model="model.community_text" :select-open="comshowSelect" placeholder="请点击上方定位后再选择小区"  @click="isChooseCommunity"></u-input>
+					<u-input type="select" v-model="model.community_text" :select-open="comshowSelect" placeholder="请在首页选择门店并点击上方定位再选择小区"  @click="isChooseCommunity"></u-input>
 				</u-form-item>
 				<u-form-item :labelStyle="labelStyle" label-position="left" label-width="150" label="详细地址:" prop="address">
 					<u-input border type="textarea" v-model="model.address" placeholder="如街道、小区、楼牌号、单元号等" />
@@ -167,8 +167,10 @@ export default {
 			let that = this;
 			let res = await that.$http('common.getNearbyCommunity', {
 				latitude: this.model.latitude,
-				longitude: this.model.latitude
+				longitude: this.model.longitude
 			}, '')
+			console.log(this.model.latitude,this.model.longitude)
+			console.log(res,"nnn")
 			this.communityList = res.data
 		},
 		// 微信导入数据格式

pages/user/set.vue

@@ -18,10 +18,10 @@
         <view class="cell-title">占用缓存</view>
         <view class="cell-right u-flex u-col-center">
           <view class="cell-content">{{ storageSize }}</view>
-          <text
+         <!-- <text
             class="u-iconfont uicon-arrow-right u-m-l-10"
             style="color: #999"
-          ></text>
+          ></text> -->
         </view>
       </view>
       <view
@@ -30,10 +30,10 @@
         <view class="cell-title">当前版本</view>
         <view class="cell-right u-flex u-col-center">
           <view class="cell-content">{{ initShop.version }}</view>
-          <text
+          <!-- <text
             class="u-iconfont uicon-arrow-right u-m-l-10"
             style="color: #999"
-          ></text>
+          ></text> -->
         </view>
       </view>
       <view

pages/user/view-log.vue

@@ -15,6 +15,7 @@
 							:price="f.goods.price"
 							:originPrice="f.goods.original_price"
 							:subtitle="f.goods.subtitle"
+							:special="true"
 							@click="$Router.push({ path: '/pages/goods/detail', query: { id: f.goods_id } })"
 						></shopro-mini-card>
 					</view>