微信小店

components/newsList.vue

@@ -55,7 +55,7 @@
 			handleActive(id) {
 				let that = this
 				// if (!uni.getStorageSync('token')) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				let type = that.isAddress == 1 || that.isAddress == 4 ? 1 : that.isAddress

components/productList.vue

@@ -87,6 +87,10 @@
 			handleCall(authlist, num) {
 				let that = this
 				console.log("authlist", authlist, that.userInfo)
+				if (!uni.getStorageSync('token')) {
+					this.$tools.msg("注册/登录后查看更多")
+					return
+				}
 				if (authlist.length) {
 					let arr = authlist.findIndex(v => v.code == 'phone:show')
 					if (arr == -1) {

pageTwo/login/add.vue

@@ -60,7 +60,7 @@
 				console.log('content', this.content)
 				that.$model.getApplyfor(this.content).then(res => {
 					if (res.code == 0) {
-						that.$tools.msg("注册成功，账号/密码同手机号!");
+						that.$tools.msg("注册成功，默认密码同手机号!");
 						setTimeout(function() {
 							uni.redirectTo({
 								url: "/pageTwo/login/login"

pageTwo/login/editPassword.vue

@@ -15,6 +15,7 @@
 					<uni-icons type="close" size="22" v-if="newPassword" @click="newPassword=' ' " />
 				</view>
 			</view>
+			<view class="tips"><text class="redcolor size18">*</text>提示：默认密码同手机号</view>
 		</view>
 		<view class="btn mt-15" @click="confirmInfo">确定</view>
 	</view>
@@ -65,6 +66,13 @@
 </script>
 
 <style scoped lang="scss">
+	.tips {
+		display: flex;
+		margin-left: 20px;
+		margin-top: 15px;
+		color: #999;
+	}
+
 	.left {
 		margin-top: 20px;
 		font-weight: bold;

pageTwo/login/login.vue

@@ -12,8 +12,11 @@
 				<image src="../../static/logo.png"></image>
 				沪抖团
 			</view>
-
+			<view class="toggle cblue" @click="handleToggle">
-			<view class="editem">
+				切换登录
+			</view>
+			<!-- 账号，密码登录 -->
+			<view class="editem" v-if="!isCode">
 				<view class="input">
 					<icon class="iconfont icon-gerenzhongxin1 mr-10"></icon>
 					<input class="uni-input input100" v-model="account" placeholder="请输入账号" />
@@ -25,21 +28,53 @@
 				<view class="tips size12" @click="$store.commit('changeSecratary', true)">
 					忘记密码联系管理员
 				</view>
+				<view class="btnlogin" @click="handleTelLogin">登录</view>
 			</view>
-			<view class="btnlogin" @click="handleTelLogin">登录</view>
+			<!-- 手机号，验证码登录 -->
-			<view class="wxbtn" @click="handleAdd">
+			<view class="editem" v-if="isCode">
+				<view class="input">
+					<icon class="iconfont icon-gerenzhongxin1 mr-10"></icon>
+					<input class="uni-input input100" v-model="account" placeholder="请输入手机号" />
+				</view>
+				<view class="input">
+					<icon class="iconfont icon-icon-test5 mr-10"></icon>
+					<view class="yanzhengma">
+						<input class="uni-input" v-model="code" placeholder="验证码" />
+						<button class="code" type="none" @click="handleCode" v-model="code"
+							:disabled="disabled">{{second<60 ? second+'S后重发':'获取验证码'}}
+						</button>
+					</view>
+				</view>
+				<view class="btnlogin" @click="handleTelLogin">登录</view>
+			</view>
+
+			<view class="register" @click="handleRegister">
 				<text>注册</text>
 			</view>
 			<view class="xieyi">
 				<checkbox-group @change="checkboxChange">
-					<checkbox :value="1" style="transform:scale(0.8)" />勾选同意沪抖团<text @click="handlexieyi "
+					<checkbox :value="1" style="transform:scale(0.8)" />勾选同意沪抖团<text @click="handlexieyi"
 						class="bluecolor">《个人信息保护政策》</text>
 				</checkbox-group>
 			</view>
 		</view>
+		<!-- 手机号快捷登录 -->
+		<view class="wxbtn">
+			<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="value==1">
+				<view>
+					<image src="../../static/phone0.png"></image>
+				</view>
+				<text>手机号快捷注册/登录</text>
+			</button>
+			<button v-else @click="handleIsTel">
+				<view>
+					<image src="../../static/phone0.png"></image>
+				</view>
+				<text>手机号快捷注册/登录</text>
+			</button>
+		</view>
 		<!-- 联系人弹框 -->
 		<secratary></secratary>
-
 	</view>
 </template>
 
@@ -51,9 +86,13 @@
 		data() {
 			return {
 				value: 0,
+				code: "",
 				account: "",
 				password: "",
-				sessionid: ""
+				sessionid: "",
+				disabled: false,
+				second: 60,
+				isCode: false,
 			}
 		},
 		computed: {
@@ -73,7 +112,6 @@
 								that.$model.onlogin({
 									code: res2.code,
 								}).then(res => {
-									console.log("11111", res)
 									if (res.code == 2) {
 										that.token = null
 										that.sessionid = res.data.sessionid
@@ -89,27 +127,40 @@
 			// 登录、
 			handleTelLogin() {
 				let that = this
-				if (!that.account) {
+				if (that.value == 0) {
+					that.$tools.msg("请先勾选同意沪抖团《个人信息保护政策》")
+					return
+				}
+				if (!that.isCode && !that.account) {
 					that.$tools.msg("请输入账号")
 					return
 				}
-				if (!that.password) {
+				if (!that.isCode && !that.password) {
 					that.$tools.msg("请输入密码")
 					return
 				}
-				if (that.password.length < 6) {
+				if (!that.isCode && that.password.length < 6) {
 					that.$tools.msg("密码长度不能小于6位数")
 					return
 				}
-				if (this.value == 0) {
+				if (that.isCode && !(/^1[3456789]\d{9}$/.test(that.account))) {
-					this.$tools.msg("请先勾选同意沪抖团《个人信息保护政策》")
+					that.$tools.msg("请输入正确的手机号")
 					return
 				}
-				this.$model.getlogin({
+				if (that.isCode && !that.code) {
+					that.$tools.msg("请输入验证码")
+					return
+				}
+				let https = !that.isCode ? that.$model.getlogin({
 					account: that.account,
 					password: that.password,
 					sessionid: that.sessionid,
-				}).then(res => {
+				}) : that.$model.getloginCode({
+					account: that.account,
+					code: that.code,
+					sessionid: that.sessionid,
+				})
+				https.then(res => {
 					if (res.code != 0) {
 						that.$tools.msg(res.message)
 						return
@@ -122,12 +173,71 @@
 					})
 				}).catch(err => {})
 			},
-			// 
+			// 获取验证码
-			handleAdd() {
+			handleCode() {
+				let that = this
+				if (!(/^1[3456789]\d{9}$/.test(that.account))) {
+					that.$tools.msg("请输入正确的手机号")
+					return
+				}
+				// 
+				that.$model.getSendCode({
+					account: that.account,
+				}).then(res => {
+					console.log(res)
+					if (res.code != 0) {
+						that.$tools.msg(res.msg)
+						return
+					}
+					that.disabled = true
+					let interval = setInterval(() => {
+						--that.second
+					}, 1000)
+					setTimeout(() => {
+						clearInterval(interval)
+						that.disabled = false
+						that.second = 60
+					}, 60000)
+				}).catch(err => {})
+			},
+			// 授权
+			getPhoneNumber(res) {
+				const that = this
+				if (res.detail.errMsg == 'getPhoneNumber:ok') {
+					that.$model.getRegisterPhone({
+						sessionid: that.sessionid,
+						encryptedData: res.detail.encryptedData,
+						iv: res.detail.iv,
+					}).then(res => {
+						if (res.code != 0) return
+						that.value = 1
+						uni.setStorageSync('token', res.data.token)
+						uni.setStorageSync('refreshtoken', res.data.refreshtoken)
+						uni.setStorageSync('sessionid', res.data.sessionid)
+						setTimeout(function() {
+							uni.reLaunch({
+								url: "/pages/index/index"
+							})
+						}, 1000)
+					})
+				}
+			},
+			// 注册
+			handleRegister() {
 				uni.navigateTo({
 					url: "/pageTwo/login/add"
 				})
 			},
+			handleToggle() {
+				this.phone = ""
+				this.isCode = !this.isCode
+			},
+			handleIsTel() {
+				if (this.value == 0) {
+					this.$tools.msg("请先确认勾选协议")
+					return
+				}
+			},
 			checkboxChange(e) {
 				this.value = e.detail.value.length ? e.detail.value[0] : "0"
 				console.log(e.detail, e.detail.value)
@@ -191,7 +301,7 @@
 		.logo {
 			width: 100%;
 			height: 55px;
-			margin-top: 15px;
+			// margin-top: 15px;
 			color: #000;
 			display: flex;
 			align-items: center;
@@ -206,13 +316,24 @@
 			}
 		}
 
+		.toggle {
+			height: 30px;
+			line-height: 30px;
+			text-align: right;
+			font-size: 16px;
+			color: $blue;
+			font-weight: bold;
+		}
+
 		.tips {
 			width: 100%;
+			height: 30px;
+			line-height: 30px;
 			text-align: right;
 		}
 
 		.editem {
-			margin-top: 28px;
+			margin-top: 15px;
 			display: flex;
 			align-items: center;
 			font-size: 28upx;
@@ -225,7 +346,7 @@
 			padding: 0 10px;
 			height: 40px;
 			line-height: 40px;
-			margin-bottom: 15px;
+			margin-bottom: 10px;
 			display: flex;
 			position: relative;
 			text-align: left;
@@ -249,7 +370,7 @@
 
 		.btnlogin {
 			width: 100%;
-			margin: 40rpx 0 20px;
+			margin: 10px 0;
 			height: 38px;
 			line-height: 38px;
 			background: $blue;
@@ -267,13 +388,15 @@
 			border-radius: 10px;
 			text-align: center;
 			position: absolute;
-			right: 2.5px;
+			right: 0;
-			top: 2.5px;
+			top: 1.5px;
+			line-height: 35px;
+			height: 35px;
 			z-index: 99;
 		}
 	}
 
-	.wxbtn {
+	.register {
 		width: 100%;
 		text-align: center;
 		color: $blue;
@@ -293,7 +416,7 @@
 		text-align: center;
 		display: flex;
 		align-items: flex-end;
-		margin-top: 40rpx;
+		margin-top: 30rpx;
 
 		checkbox-group {
 			text-align: left;
@@ -303,4 +426,51 @@
 			border-bottom: 1px solid #333;
 		}
 	}
+
+	.wxbtn {
+		width: 100%;
+		position: absolute;
+		margin-top: 10px;
+		top: 78%;
+
+		icon {
+			font-size: 25px;
+			color: #28c445;
+		}
+
+
+		text {
+			display: block;
+			// width: 100%;
+			margin-top: 5px;
+			font-size: 15px;
+			// color: #666;
+			text-align: center;
+			border-bottom: 1px solid blue;
+			color: blue;
+		}
+
+		button {
+			line-height: initial;
+			// background: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0;
+			justify-content: center;
+		}
+
+		button::after {
+			display: none;
+		}
+
+		view {
+			width: 100%;
+		}
+
+		image {
+			width: 40px;
+			height: 40px;
+			border-radius: 50%;
+		}
+	}
 </style>

pageTwo/me/addVip.vue

@@ -2,15 +2,27 @@
 	<view class="box fromClass">
 		<view class="lanBox">
 			<view class="lan border-bottom">
-				<view class="left">系统划分</view>
+				<view class="left">姓名<text class="redcolor">*</text></view>
 				<view class="right">
-					<picker mode="selector" :range="industrylist" range-key="name" :value="content.industryname"
+					<input name="name" type="text" v-model="content.name" placeholder="姓名" />
-						@change="changeIndustry">
+				</view>
-						<view class="uni-input">{{content.industryname?content.industryname:"请选择"}}</view>
+			</view>
+			<view class="lan border-bottom">
+				<view class="left">性别</view>
+				<view class="right">
+					<picker mode="selector" :range="sexItem" @change="onsexArr">
+						<view class="uni-input">{{content.sex==0?'请选择':content.sex==1?'男':content.sex==2?'女':'未知'}}
+						</view>
 						<uni-icons type="forward" size="20" color="#999"></uni-icons>
 					</picker>
 				</view>
 			</view>
+			<view class="lan border-bottom">
+				<view class="left">手机号</view>
+				<view class="right">
+					<input name="name" type="text" v-model="content.phone" placeholder="手机号" />
+				</view>
+			</view>
 			<view class="lan border-bottom">
 				<view class="left">个人照片</view>
 				<view class="right touxiang" v-if="content.avatar">
@@ -21,16 +33,22 @@
 				<view class="right touxiang size20 bold" v-else @click="handleimage(1)">+</view>
 				<text class="size12 c999 desc">请上传1寸蓝底照片，大小不超过2M</text>
 			</view>
-
 			<view class="lan border-bottom">
-				<view class="left">性别</view>
+				<view class="left">系统划分</view>
 				<view class="right">
-					<picker mode="selector" :range="sexItem" @change="onsexArr">
+					<picker mode="selector" :range="industrylist" range-key="name" :value="content.industryname"
-						<view class="uni-input">{{content.sex==0?'请选择':content.sex==1?'男':'女'}}</view>
+						@change="changeIndustry">
+						<view class="uni-input">{{content.industryname?content.industryname:"请选择"}}</view>
 						<uni-icons type="forward" size="20" color="#999"></uni-icons>
 					</picker>
 				</view>
 			</view>
+			<view class="lan border-bottom">
+				<view class="left">企业全称</view>
+				<view class="right">
+					<input name="name" type="text" v-model="content.comName" placeholder="企业全称" />
+				</view>
+			</view>
 			<view class="lan border-bottom">
 				<view class="left">公司职位</view>
 				<view class="right">
@@ -143,9 +161,9 @@
 		onLoad(options) {
 			let that = this
 			that.addNeeds = that.$json.addNeeds
-			that.content.name = that.user.name
+			that.content.name = that.user.name?that.user.name:''
-			that.content.phone = that.user.phone
+			that.content.phone = that.user.phone?that.user.phone:""
-			that.content.comName = that.user.cominfo.name
+			that.content.comName = that.user.cominfo.name?that.user.cominfo.name:''
 			that.content.sex = that.user.sex ? that.user.sex : ""
 			that.content.avatar = that.user.avatar ? that.user.avatar : ''
 			that.content.provide = that.user.provide ? that.user.provide : ""
@@ -160,18 +178,32 @@
 			// 提交
 			confirmInfo() {
 				let that = this
-				if (!this.content.industryname) {
+				if (!this.content.name) {
-					this.$tools.msg("请选择系统划分")
+					this.$tools.msg("请输入姓名")
-					return;
-				}
-				if (!this.content.avatarurl) {
-					this.$tools.msg("请上传个人照片")
 					return;
 				}
 				if (!this.content.sex) {
 					this.$tools.msg("请选择性别")
 					return;
 				}
+				if (!this.content.phone) {
+					this.$tools.msg("请输入手机号")
+					return;
+				}
+				if (!this.content.avatarurl) {
+					this.$tools.msg("请上传个人照片")
+					return;
+				}
+				if (!this.content.industryname) {
+					this.$tools.msg("请选择系统划分")
+					return;
+				}
+
+				if (!this.content.comName) {
+					this.$tools.msg("请输入企业全称")
+					return;
+				}
+
 				if (!this.content.comPos) {
 					this.$tools.msg("请输入公司职位")
 					return;

pageTwo/me/user.vue

@@ -166,8 +166,7 @@
 			let that = this
 			this.addNeeds = this.$json.addNeeds
 			this.userInfo = this.user.name ? this.user : {}
-			this.userInfo.industryname = this.user.industryid ? this.industrylist[that.industrylist.findIndex(ite => ite
+			this.userInfo.industryname = this.user.industryid ? this.industrylist[that.industrylist.findIndex(ite => ite.id === that.userInfo.industryid)].name : ''
-				.id === that.userInfo.industryid)].name : ''
 			this.checkbox = this.userInfo.demand ? this.userInfo.demand.split(',') : []
 		},
 		methods: {

pageTwo/product/detail.vue

@@ -54,11 +54,13 @@
 				content: null,
 				type: 3,
 				id: "",
+				token:""
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
 			this.type = options.type
+			this.token = uni.getStorageSync('token')
 			this.handleDetail(options.id, options.type)
 		},
 		computed: {
@@ -124,6 +126,10 @@
 			handleCall(authlist, num) {
 				let that = this
 				console.log("authlist", authlist, that.userInfo)
+				if (!that.token) {
+					that.$tools.msg("注册/登录后查看更多")
+					return
+				}
 				if (authlist.length) {
 					let arr = authlist.findIndex(v => v.code == 'phone:show')
 					if (arr == -1) {

pageTwo/product/list.vue

@@ -115,7 +115,7 @@
 			handlefabu() {
 				let that = this
 				if (!uni.getStorageSync('token')) {
-					that.$tools.msg("登录后查看更多")
+					that.$tools.msg("注册/登录后查看更多")
 					return
 				}
 				let type = this.type == 3 ? 3 : this.active == 1 ? 8 : 9
@@ -127,10 +127,10 @@
 							url: "/pageTwo/me/addNeeds?status=add&type=" + type
 						})
 					} else {
-						that.$store.commit("changeSecratary", true);
+						that.$tools.msg("加入我们获得更多权限！")
 					}
 				} else {
-					that.$store.commit("changeSecratary", true);
+					that.$tools.msg("加入我们获得更多权限！")
 				}
 				console.log("发布", that.user.authlist)
 			},
@@ -140,7 +140,7 @@
 				let type = this.type == 3 ? 3 : this.active == 1 ? 8 : 9
 				console.log("详情", this.active)
 				// if (!uni.getStorageSync('token')) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				that.$model.getProductDetail({
@@ -162,7 +162,7 @@
 			handleSearch(name, province, city, industryid) {
 				let that = this
 				// if (!uni.getStorageSync('token')) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				this.name = name

pages/index/fengCai.vue

@@ -80,7 +80,7 @@
 			handleSearch(name) {
 				let that = this
 				// if (!uni.getStorageSync('token')) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				this.name = name
@@ -92,7 +92,7 @@
 			handledetail(ite) {
 				let that = this
 				// if (!uni.getStorageSync('token')) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				uni.navigateTo({

pages/index/index.vue

@@ -2,14 +2,14 @@
 	<view class="content">
 		<!-- 搜索 -->
 		<view class="head">
-			<piker-search @handleSearch="handleSearch" :placeholder='"找客户/找产品"' :width="'60'"></piker-search>
+			<piker-search @handleSearch="handleSearch" :placeholder='"找产品/找方案"' :width="'60'"></piker-search>
 			<view class="fangke">
 				<icon class="iconfont icon-remen"></icon>
 				<text>今日访客：{{todayviewer}}人</text>
 			</view>
 		</view>
 		<view class="login" @click="handleLogin" v-if="!token">
-			登录后查看更多内容资讯，点击此处<text>登录/注册</text>
+			登录/注册后查看更多，点击此处<text>登录/注册</text>
 		</view>
 		<!-- banner  -->
 		<view class="tips" :style="{'margin':!token?'0':'50px 0 10px'}">
@@ -35,7 +35,7 @@
 			</view>
 			<!-- 工具 -->
 			<view class="tools">
-				<view class="item" v-for="(item,index) in navbarlist" :key="index" @click="handlePath(index,item.link)">
+				<view class="item" v-for="(item,index) in navbarlist" :key="index" @click="handlePath(index,item)">
 					<image :src="item.image"></image>
 					<text>{{item.name}}</text>
 				</view>
@@ -45,9 +45,8 @@
 				<swiper class="swiper" autoplay="true">
 					<swiper-item v-for="(ite, index) in centerList" :key="index">
 						<image :src="ite.headimg" v-if='ite.posfmtype!=2' @click="detail(ite.id,5)" />
-						<video v-else id="myVideo" :src="ite.headimg" @error="videoErrorCallback" controls
+						<video v-else id="myVideo" :src="ite.headimg" @error="videoErrorCallback" controls :muted="true"
-							:muted="true" :autoplay="true" :show-mute-btn='true' object-fit="fill"
+							:autoplay="true" :show-mute-btn='true' object-fit="fill" :loop="true"></video>
-							:loop="true"></video>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -72,7 +71,7 @@
 			<!-- 资讯活动 -->
 			<view class="zixun">
 				<view class="title mt-10" @click="navTo('/pageTwo/news/list?type=1')">
-					<text>资讯活动</text>
+					<text>资讯</text>
 					<text v-if="newsList.length">查看更多></text>
 				</view>
 				<list :isAddress="1" :list="newsList" v-if="newsList.length" @handleSearchId="handleSearchId">
@@ -86,6 +85,16 @@
 			<message></message>
 			<!-- 底部 -->
 			<tabbar :tabInd="0"></tabbar>
+			<!-- 微信小店 -->
+			<view class="wrapper" v-if="isShop">
+				<view class="bg" @click="isShop = false">
+					<view class="edit" @click.stop>
+						<store-home :appid="shopId" style="width: 100%;height: 90px;"></store-home>
+						<view @click="isShop = false" class="close">取消</view>
+						<!-- <image src="../../static/error.png" @click="isShop = false"></image> -->
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -103,6 +112,8 @@
 			return {
 				list: [],
 				token: '',
+				shopId: "",
+				isShop: false
 			}
 		},
 		computed: {
@@ -227,7 +238,7 @@
 			handleDetail(ite) {
 				let that = this
 				// if (!that.token) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				uni.navigateTo({
@@ -240,7 +251,7 @@
 				let that = this
 				console.log("搜索信息返回", ite)
 				// if (!that.token) {
-				// 	that.$tools.msg("登录后查看更多")
+				// 	that.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				if (ite != "") {
@@ -250,20 +261,15 @@
 				}
 			},
 			// 工具栏跳转
-			handlePath(ind, url) {
+			handlePath(ind, ite) {
 				let that = this
-				this.navTo(url)
+				if (ite.link != "") {
-				// if (ind == 3) {
+					that.navTo(ite.link)
-				// 	uni.switchTab({
+				}
-				// 		url: url
+				if (ite.appid != "") {
-				// 	})
+					that.shopId = ite.appid
-				// } else if (ind == 2) {
+					that.isShop = true
-				// 	uni.navigateTo({
+				}
-				// 		url: url + "?content=2"
-				// 	})
-				// } else {
-				// 	this.navTo(url)
-				// }
 			},
 			// 轮播、公告、资讯详情
 			detail(id, type) {
@@ -432,6 +438,7 @@
 		flex-wrap: wrap;
 		margin-top: 10px;
 		padding-top: 10px;
+		overflow: hidden;
 		border-radius: 10px;
 		background-color: #fff;
 
@@ -587,4 +594,29 @@
 			display: block;
 		}
 	}
+
+	.bg {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.edit {
+			border-radius: 5px;
+			height: 125px;
+			padding: 20px;
+			margin: 0 !important;
+			display: flex;
+			justify-content: center;
+			flex-wrap: wrap;
+
+			.close {
+				width: 100px;
+				height: 35px;
+				line-height: 35px;
+				margin-top: 15px;
+				border-radius: 5px;
+				background-color: #eae7e7;
+			}
+		}
+	}
 </style>

pages/index/searchList.vue

@@ -246,6 +246,10 @@
 			handleCall(authlist, num) {
 				let that = this
 				console.log("authlist", authlist, that.userInfo)
+				if (!uni.getStorageSync('token')) {
+					this.$tools.msg("注册/登录后查看更多")
+					return
+				}
 				if (authlist.length) {
 					let arr = authlist.findIndex(v => v.code == 'phone:show')
 					if (arr == -1) {

pages/me/me.vue

@@ -30,7 +30,7 @@
 			</view>
 		</view>
 		<view v-else class="login" @click="handleLogin">
-			登录后查看更多内容资讯，点击此处<text>登录/注册</text>
+			登录/注册后查看更多，点击此处<text>登录/注册</text>
 		</view>
 		<!-- vip -->
 		<view class="vip" :class="[!token?'marginTop':'']">
@@ -220,8 +220,8 @@
 				this.$store.commit("changeSecratary", true);
 			},
 			handleisCare() {
-				if (!this.token) {
+				if (!uni.getStorageSync('token')) {
-					this.$tools.msg("登录后查看更多")
+					this.$tools.msg("注册/登录后查看更多")
 					return
 				}
 				this.isCard = !this.isCard
@@ -234,8 +234,8 @@
 				})
 			},
 			navTo(url) {
-				if (!this.token) {
+				if (!uni.getStorageSync('token')) {
-					this.$tools.msg("登录后查看更多")
+					this.$tools.msg("注册/登录后查看更多")
 					return
 				}
 				this.isCard = false
@@ -541,7 +541,7 @@
 					height: 160rpx;
 					position: absolute;
 					right: 10px;
-					bottom: 30px;
+					bottom: 8px;
 
 					image {
 						width: 100%;

pages/phoneList/detail.vue

@@ -217,6 +217,10 @@
 			handleCall(authlist, num) {
 				let that = this
 				console.log("authlist", authlist, that.userInfo)
+				if (!uni.getStorageSync('token')) {
+					this.$tools.msg("注册/登录后查看更多")
+					return
+				}
 				if (authlist.length) {
 					let arr = authlist.findIndex(v => v.code == 'phone:show')
 					if (arr == -1) {

pages/phoneList/phoneList.vue

@@ -104,7 +104,7 @@
 			},
 			handleSearch(name, province, city, industryid) {
 				// if (!this.token) {
-				// 	this.$tools.msg("登录后查看更多")
+				// 	this.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				this.name = name
@@ -119,7 +119,7 @@
 			// 详情
 			handledetail(ite) {
 				// if (!this.token) {
-				// 	this.$tools.msg("登录后查看更多")
+				// 	this.$tools.msg("注册/登录后查看更多查看更多")
 				// 	return
 				// }
 				uni.navigateTo({

tools/https.js

@@ -30,14 +30,14 @@ const httpRequest = (url, method = "get", data) => {
 					uni.setStorageSync('refreshtoken', null)
 					uni.showToast({
 						icon: "none",
-						title: "登录后查看更多",
+						title: "注册/登录后查看更多",
-						duration: 2000
+						duration: 5000
 					});
 					setTimeout(function() {
 						uni.switchTab({
 							url: "/pages/index/index"
 						})
-					}, 2000)
+					}, 3000)
 					return
 				}
 				// if (res[1].statusCode != 200) {

tools/model.js

@@ -13,6 +13,22 @@ export default {
 			return res
 		})
 	},
+	getloginCode(param) { // 验证码登录
+		return http.post("/api/app/wxopen/loginbycode", param).then(res => {
+			return res
+		})
+	},
+	getSendCode(param) { // 获取验证码
+		return http.post("/api/app/wxopen/sendcode", param).then(res => {
+			return res
+		})
+	},
+	// 手机号快捷登录
+	getRegisterPhone(param) {
+		return http.post("/api/app/wxopen/loginnew", param).then(res => {
+			return res
+		})
+	},
 	getoutlogin(param) { // 退出登录
 		return http.post("/api/app/wxopen/logout", param).then(res => {
 			return res
@@ -38,7 +54,7 @@ export default {
 			return res
 		})
 	},
-
+	
 	// 内容管理
 	getHomeContent(param) { // 获取首页内容
 		return http.post("/api/app/home/content", param).then(res => {

tools/tools.js

@@ -54,7 +54,7 @@ function getCall(authlist, num) {
 function msg(str) {
 	uni.showToast({
 		title: str,
-		duration: 3000,
+		duration: 5000,
 		icon: 'none'
 	})
 }

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -2110,7 +2110,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -9153,7 +9153,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -9174,14 +9174,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9277,7 +9277,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"RuoDianGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -13128,6 +13128,24 @@ var _default = {
       return res;
     });
   },
+  getloginCode: function getloginCode(param) {
+    // 验证码登录
+    return _https.default.post("/api/app/wxopen/loginbycode", param).then(function (res) {
+      return res;
+    });
+  },
+  getSendCode: function getSendCode(param) {
+    // 获取验证码
+    return _https.default.post("/api/app/wxopen/sendcode", param).then(function (res) {
+      return res;
+    });
+  },
+  // 手机号快捷登录
+  getRegisterPhone: function getRegisterPhone(param) {
+    return _https.default.post("/api/app/wxopen/loginnew", param).then(function (res) {
+      return res;
+    });
+  },
   getoutlogin: function getoutlogin(param) {
     // 退出登录
     return _https.default.post("/api/app/wxopen/logout", param).then(function (res) {
@@ -13353,14 +13371,14 @@ var httpRequest = function httpRequest(url) {
         uni.setStorageSync('refreshtoken', null);
         uni.showToast({
           icon: "none",
-          title: "登录后查看更多",
+          title: "注册/登录后查看更多",
-          duration: 2000
+          duration: 5000
         });
         setTimeout(function () {
           uni.switchTab({
             url: "/pages/index/index"
           });
-        }, 2000);
+        }, 3000);
         return;
       }
       // if (res[1].statusCode != 200) {
@@ -13493,7 +13511,7 @@ function getCall(authlist, num) {
 function msg(str) {
   uni.showToast({
     title: str,
-    duration: 3000,
+    duration: 5000,
     icon: 'none'
   });
 }

unpackage/dist/dev/mp-weixin/components/newsList.js

@@ -175,7 +175,7 @@ var _default2 = {
     handleActive: function handleActive(id) {
       var that = this;
       // if (!uni.getStorageSync('token')) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       var type = that.isAddress == 1 || that.isAddress == 4 ? 1 : that.isAddress;

unpackage/dist/dev/mp-weixin/components/productList.js

@@ -183,6 +183,10 @@ var _default2 = {
     handleCall: function handleCall(authlist, num) {
       var that = this;
       console.log("authlist", authlist, that.userInfo);
+      if (!uni.getStorageSync('token')) {
+        this.$tools.msg("注册/登录后查看更多");
+        return;
+      }
       if (authlist.length) {
         var arr = authlist.findIndex(function (v) {
           return v.code == 'phone:show';

unpackage/dist/dev/mp-weixin/pageTwo/login/add.js

@@ -176,7 +176,7 @@ var _default = {
       console.log('content', this.content);
       that.$model.getApplyfor(this.content).then(function (res) {
         if (res.code == 0) {
-          that.$tools.msg("注册成功，账号/密码同手机号!");
+          that.$tools.msg("注册成功，默认密码同手机号!");
           setTimeout(function () {
             uni.redirectTo({
               url: "/pageTwo/login/login"

unpackage/dist/dev/mp-weixin/pageTwo/login/editPassword.js

@@ -195,6 +195,7 @@ var _vuex = __webpack_require__(/*! vuex */ 38);
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pageTwo/login/editPassword.wxml

@@ -1 +1 @@
-<view class="content inputClass bgfff data-v-3bbe3b4b"><view class="lanBox data-v-3bbe3b4b"><view class="lan data-v-3bbe3b4b"><view class="left data-v-3bbe3b4b">旧密码</view><view class="right data-v-3bbe3b4b"><input type="text" placeholder="请输入您的旧密码" data-event-opts="{{[['input',[['__set_model',['','oldPassword','$event',[]]]]]]}}" value="{{oldPassword}}" bindinput="__e" class="data-v-3bbe3b4b"/><block wx:if="{{oldPassword}}"><uni-icons vue-id="3c09af1b-1" type="close" size="22" data-event-opts="{{[['^click',[['e0']]]]}}" bind:click="__e" class="data-v-3bbe3b4b" bind:__l="__l"></uni-icons></block></view></view><view class="lan data-v-3bbe3b4b"><view class="left data-v-3bbe3b4b">新密码</view><view class="right data-v-3bbe3b4b"><input type="text" placeholder="请输入您的新密码" data-event-opts="{{[['input',[['__set_model',['','newPassword','$event',[]]]]]]}}" value="{{newPassword}}" bindinput="__e" class="data-v-3bbe3b4b"/><block wx:if="{{newPassword}}"><uni-icons vue-id="3c09af1b-2" type="close" size="22" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" class="data-v-3bbe3b4b" bind:__l="__l"></uni-icons></block></view></view></view><view data-event-opts="{{[['tap',[['confirmInfo',['$event']]]]]}}" class="btn mt-15 data-v-3bbe3b4b" bindtap="__e">确定</view></view>
+<view class="content inputClass bgfff data-v-3bbe3b4b"><view class="lanBox data-v-3bbe3b4b"><view class="lan data-v-3bbe3b4b"><view class="left data-v-3bbe3b4b">旧密码</view><view class="right data-v-3bbe3b4b"><input type="text" placeholder="请输入您的旧密码" data-event-opts="{{[['input',[['__set_model',['','oldPassword','$event',[]]]]]]}}" value="{{oldPassword}}" bindinput="__e" class="data-v-3bbe3b4b"/><block wx:if="{{oldPassword}}"><uni-icons vue-id="3c09af1b-1" type="close" size="22" data-event-opts="{{[['^click',[['e0']]]]}}" bind:click="__e" class="data-v-3bbe3b4b" bind:__l="__l"></uni-icons></block></view></view><view class="lan data-v-3bbe3b4b"><view class="left data-v-3bbe3b4b">新密码</view><view class="right data-v-3bbe3b4b"><input type="text" placeholder="请输入您的新密码" data-event-opts="{{[['input',[['__set_model',['','newPassword','$event',[]]]]]]}}" value="{{newPassword}}" bindinput="__e" class="data-v-3bbe3b4b"/><block wx:if="{{newPassword}}"><uni-icons vue-id="3c09af1b-2" type="close" size="22" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" class="data-v-3bbe3b4b" bind:__l="__l"></uni-icons></block></view></view><view class="tips data-v-3bbe3b4b"><text class="redcolor size18 data-v-3bbe3b4b">*</text>提示：默认密码同手机号</view></view><view data-event-opts="{{[['tap',[['confirmInfo',['$event']]]]]}}" class="btn mt-15 data-v-3bbe3b4b" bindtap="__e">确定</view></view>

unpackage/dist/dev/mp-weixin/pageTwo/login/editPassword.wxss

@@ -24,6 +24,12 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tips.data-v-3bbe3b4b {
+  display: flex;
+  margin-left: 20px;
+  margin-top: 15px;
+  color: #999;
+}
 .left.data-v-3bbe3b4b {
   margin-top: 20px;
   font-weight: bold;

unpackage/dist/dev/mp-weixin/pageTwo/login/login.js

@@ -186,9 +186,13 @@ var _default = {
   data: function data() {
     return {
       value: 0,
+      code: "",
       account: "",
       password: "",
-      sessionid: ""
+      sessionid: "",
+      disabled: false,
+      second: 60,
+      isCode: false
     };
   },
   computed: _objectSpread({}, (0, _vuex.mapState)(["HomeContent"])),
@@ -220,7 +224,6 @@ var _default = {
               that.$model.onlogin({
                 code: res2.code
               }).then(function (res) {
-                console.log("11111", res);
                 if (res.code == 2) {
                   that.token = null;
                   that.sessionid = res.data.sessionid;
@@ -236,27 +239,40 @@ var _default = {
     // 登录、
     handleTelLogin: function handleTelLogin() {
       var that = this;
-      if (!that.account) {
+      if (that.value == 0) {
+        that.$tools.msg("请先勾选同意沪抖团《个人信息保护政策》");
+        return;
+      }
+      if (!that.isCode && !that.account) {
         that.$tools.msg("请输入账号");
         return;
       }
-      if (!that.password) {
+      if (!that.isCode && !that.password) {
         that.$tools.msg("请输入密码");
         return;
       }
-      if (that.password.length < 6) {
+      if (!that.isCode && that.password.length < 6) {
         that.$tools.msg("密码长度不能小于6位数");
         return;
       }
-      if (this.value == 0) {
+      if (that.isCode && !/^1[3456789]\d{9}$/.test(that.account)) {
-        this.$tools.msg("请先勾选同意沪抖团《个人信息保护政策》");
+        that.$tools.msg("请输入正确的手机号");
         return;
       }
-      this.$model.getlogin({
+      if (that.isCode && !that.code) {
+        that.$tools.msg("请输入验证码");
+        return;
+      }
+      var https = !that.isCode ? that.$model.getlogin({
         account: that.account,
         password: that.password,
         sessionid: that.sessionid
-      }).then(function (res) {
+      }) : that.$model.getloginCode({
+        account: that.account,
+        code: that.code,
+        sessionid: that.sessionid
+      });
+      https.then(function (res) {
         if (res.code != 0) {
           that.$tools.msg(res.message);
           return;
@@ -269,12 +285,71 @@ var _default = {
         });
       }).catch(function (err) {});
     },
-    // 
+    // 获取验证码
-    handleAdd: function handleAdd() {
+    handleCode: function handleCode() {
+      var that = this;
+      if (!/^1[3456789]\d{9}$/.test(that.account)) {
+        that.$tools.msg("请输入正确的手机号");
+        return;
+      }
+      // 
+      that.$model.getSendCode({
+        account: that.account
+      }).then(function (res) {
+        console.log(res);
+        if (res.code != 0) {
+          that.$tools.msg(res.msg);
+          return;
+        }
+        that.disabled = true;
+        var interval = setInterval(function () {
+          --that.second;
+        }, 1000);
+        setTimeout(function () {
+          clearInterval(interval);
+          that.disabled = false;
+          that.second = 60;
+        }, 60000);
+      }).catch(function (err) {});
+    },
+    // 授权
+    getPhoneNumber: function getPhoneNumber(res) {
+      var that = this;
+      if (res.detail.errMsg == 'getPhoneNumber:ok') {
+        that.$model.getRegisterPhone({
+          sessionid: that.sessionid,
+          encryptedData: res.detail.encryptedData,
+          iv: res.detail.iv
+        }).then(function (res) {
+          if (res.code != 0) return;
+          that.value = 1;
+          uni.setStorageSync('token', res.data.token);
+          uni.setStorageSync('refreshtoken', res.data.refreshtoken);
+          uni.setStorageSync('sessionid', res.data.sessionid);
+          setTimeout(function () {
+            uni.reLaunch({
+              url: "/pages/index/index"
+            });
+          }, 1000);
+        });
+      }
+    },
+    // 注册
+    handleRegister: function handleRegister() {
       uni.navigateTo({
         url: "/pageTwo/login/add"
       });
     },
+    handleToggle: function handleToggle() {
+      this.phone = "";
+      this.isCode = !this.isCode;
+    },
+    handleIsTel: function handleIsTel() {
+      if (this.value == 0) {
+        this.$tools.msg("请先确认勾选协议");
+        return;
+      }
+    },
     checkboxChange: function checkboxChange(e) {
       this.value = e.detail.value.length ? e.detail.value[0] : "0";
       console.log(e.detail, e.detail.value);

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxml

@@ -1 +1 @@
-<view class="content data-v-111bb4d3"><view class="topbg data-v-111bb4d3"><view class="ts data-v-111bb4d3"><view class="mb-5 data-v-111bb4d3">欢迎登录</view><view class="data-v-111bb4d3">沪抖团线上展厅</view></view></view><view class="edit data-v-111bb4d3"><view class="logo data-v-111bb4d3"><image src="../../static/logo.png" class="data-v-111bb4d3"></image>沪抖团</view><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><icon class="iconfont icon-gerenzhongxin1 mr-10 data-v-111bb4d3"></icon><input class="uni-input input100 data-v-111bb4d3" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e"/></view><view class="input data-v-111bb4d3"><icon class="iconfont icon-icon-test5 mr-10 data-v-111bb4d3"></icon><input class="uni-input data-v-111bb4d3" type="password" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="tips size12 data-v-111bb4d3" bindtap="__e">忘记密码联系管理员</view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view><view data-event-opts="{{[['tap',[['handleAdd',['$event']]]]]}}" class="wxbtn data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">注册</text></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-111bb4d3"><checkbox style="transform:scale(0.8);" value="{{1}}" class="data-v-111bb4d3"></checkbox>勾选同意沪抖团<text data-event-opts="{{[['tap',[['handlexieyi',['$event']]]]]}}" class="bluecolor data-v-111bb4d3" bindtap="__e">《个人信息保护政策》</text></checkbox-group></view></view><secratary vue-id="125b6693-1" class="data-v-111bb4d3" bind:__l="__l"></secratary></view>
+<view class="content data-v-111bb4d3"><view class="topbg data-v-111bb4d3"><view class="ts data-v-111bb4d3"><view class="mb-5 data-v-111bb4d3">欢迎登录</view><view class="data-v-111bb4d3">沪抖团线上展厅</view></view></view><view class="edit data-v-111bb4d3"><view class="logo data-v-111bb4d3"><image src="../../static/logo.png" class="data-v-111bb4d3"></image>沪抖团</view><view data-event-opts="{{[['tap',[['handleToggle',['$event']]]]]}}" class="toggle cblue data-v-111bb4d3" bindtap="__e">切换登录</view><block wx:if="{{!isCode}}"><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><icon class="iconfont icon-gerenzhongxin1 mr-10 data-v-111bb4d3"></icon><input class="uni-input input100 data-v-111bb4d3" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e"/></view><view class="input data-v-111bb4d3"><icon class="iconfont icon-icon-test5 mr-10 data-v-111bb4d3"></icon><input class="uni-input data-v-111bb4d3" type="password" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="tips size12 data-v-111bb4d3" bindtap="__e">忘记密码联系管理员</view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view></view></block><block wx:if="{{isCode}}"><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><icon class="iconfont icon-gerenzhongxin1 mr-10 data-v-111bb4d3"></icon><input class="uni-input input100 data-v-111bb4d3" placeholder="请输入手机号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e"/></view><view class="input data-v-111bb4d3"><icon class="iconfont icon-icon-test5 mr-10 data-v-111bb4d3"></icon><view class="yanzhengma data-v-111bb4d3"><input class="uni-input data-v-111bb4d3" placeholder="验证码" data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" value="{{code}}" bindinput="__e"/><button class="code data-v-111bb4d3" type="none" disabled="{{disabled}}" value="{{code}}" data-event-opts="{{[['tap',[['handleCode',['$event']]]],['input',[['__set_model',['','code','$event',[]]]]]]}}" bindtap="__e" bindinput="__e">{{(second<60?second+'S后重发':'获取验证码')+''}}</button></view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view></view></block><view data-event-opts="{{[['tap',[['handleRegister',['$event']]]]]}}" class="register data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">注册</text></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-111bb4d3"><checkbox style="transform:scale(0.8);" value="{{1}}" class="data-v-111bb4d3"></checkbox>勾选同意沪抖团<text data-event-opts="{{[['tap',[['handlexieyi',['$event']]]]]}}" class="bluecolor data-v-111bb4d3" bindtap="__e">《个人信息保护政策》</text></checkbox-group></view></view><view class="wxbtn data-v-111bb4d3"><block wx:if="{{value==1}}"><button open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone0.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷注册/登录</text></button></block><block wx:else><button data-event-opts="{{[['tap',[['handleIsTel',['$event']]]]]}}" bindtap="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone0.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷注册/登录</text></button></block></view><secratary vue-id="125b6693-1" class="data-v-111bb4d3" bind:__l="__l"></secratary></view>

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxss

@@ -66,7 +66,6 @@
 .edit .logo.data-v-111bb4d3 {
   width: 100%;
   height: 55px;
-  margin-top: 15px;
   color: #000;
   display: flex;
   align-items: center;
@@ -79,12 +78,22 @@
   height: 53px;
   margin-right: 10px;
 }
+.edit .toggle.data-v-111bb4d3 {
+  height: 30px;
+  line-height: 30px;
+  text-align: right;
+  font-size: 16px;
+  color: #3f378d;
+  font-weight: bold;
+}
 .edit .tips.data-v-111bb4d3 {
   width: 100%;
+  height: 30px;
+  line-height: 30px;
   text-align: right;
 }
 .edit .editem.data-v-111bb4d3 {
-  margin-top: 28px;
+  margin-top: 15px;
   display: flex;
   align-items: center;
   font-size: 28rpx;
@@ -96,7 +105,7 @@
   padding: 0 10px;
   height: 40px;
   line-height: 40px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
   display: flex;
   position: relative;
   text-align: left;
@@ -117,7 +126,7 @@
 }
 .edit .btnlogin.data-v-111bb4d3 {
   width: 100%;
-  margin: 40rpx 0 20px;
+  margin: 10px 0;
   height: 38px;
   line-height: 38px;
   background: #3f378d;
@@ -134,11 +143,13 @@
   border-radius: 10px;
   text-align: center;
   position: absolute;
-  right: 2.5px;
+  right: 0;
-  top: 2.5px;
+  top: 1.5px;
+  line-height: 35px;
+  height: 35px;
   z-index: 99;
 }
-.wxbtn.data-v-111bb4d3 {
+.register.data-v-111bb4d3 {
   width: 100%;
   text-align: center;
   color: #3f378d;
@@ -146,7 +157,7 @@
   align-items: flex-end;
   justify-content: center;
 }
-.wxbtn text.data-v-111bb4d3 {
+.register text.data-v-111bb4d3 {
   border-bottom: 1px solid #3f378d;
 }
 .xieyi.data-v-111bb4d3 {
@@ -156,7 +167,7 @@
   text-align: center;
   display: flex;
   align-items: flex-end;
-  margin-top: 40rpx;
+  margin-top: 30rpx;
 }
 .xieyi checkbox-group.data-v-111bb4d3 {
   text-align: left;
@@ -164,4 +175,40 @@
 .xieyi text.data-v-111bb4d3 {
   border-bottom: 1px solid #333;
 }
+.wxbtn.data-v-111bb4d3 {
+  width: 100%;
+  position: absolute;
+  margin-top: 10px;
+  top: 78%;
+}
+.wxbtn icon.data-v-111bb4d3 {
+  font-size: 25px;
+  color: #28c445;
+}
+.wxbtn text.data-v-111bb4d3 {
+  display: block;
+  margin-top: 5px;
+  font-size: 15px;
+  text-align: center;
+  border-bottom: 1px solid blue;
+  color: blue;
+}
+.wxbtn button.data-v-111bb4d3 {
+  line-height: initial;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  justify-content: center;
+}
+.wxbtn button.data-v-111bb4d3::after {
+  display: none;
+}
+.wxbtn view.data-v-111bb4d3 {
+  width: 100%;
+}
+.wxbtn image.data-v-111bb4d3 {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
 

unpackage/dist/dev/mp-weixin/pageTwo/me/addVip.js

@@ -230,9 +230,9 @@ var _default = {
   onLoad: function onLoad(options) {
     var that = this;
     that.addNeeds = that.$json.addNeeds;
-    that.content.name = that.user.name;
+    that.content.name = that.user.name ? that.user.name : '';
-    that.content.phone = that.user.phone;
+    that.content.phone = that.user.phone ? that.user.phone : "";
-    that.content.comName = that.user.cominfo.name;
+    that.content.comName = that.user.cominfo.name ? that.user.cominfo.name : '';
     that.content.sex = that.user.sex ? that.user.sex : "";
     that.content.avatar = that.user.avatar ? that.user.avatar : '';
     that.content.provide = that.user.provide ? that.user.provide : "";
@@ -248,16 +248,28 @@ var _default = {
     // 提交
     confirmInfo: function confirmInfo() {
       var that = this;
-      if (!this.content.industryname) {
+      if (!this.content.name) {
-        this.$tools.msg("请选择系统划分");
+        this.$tools.msg("请输入姓名");
+        return;
+      }
+      if (!this.content.sex) {
+        this.$tools.msg("请选择性别");
+        return;
+      }
+      if (!this.content.phone) {
+        this.$tools.msg("请输入手机号");
         return;
       }
       if (!this.content.avatarurl) {
         this.$tools.msg("请上传个人照片");
         return;
       }
-      if (!this.content.sex) {
+      if (!this.content.industryname) {
-        this.$tools.msg("请选择性别");
+        this.$tools.msg("请选择系统划分");
+        return;
+      }
+      if (!this.content.comName) {
+        this.$tools.msg("请输入企业全称");
         return;
       }
       if (!this.content.comPos) {

unpackage/dist/dev/mp-weixin/pageTwo/product/detail.js

@@ -151,12 +151,14 @@ var _default = {
     return {
       content: null,
       type: 3,
-      id: ""
+      id: "",
+      token: ""
     };
   },
   onLoad: function onLoad(options) {
     this.id = options.id;
     this.type = options.type;
+    this.token = uni.getStorageSync('token');
     this.handleDetail(options.id, options.type);
   },
   computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(["user"])), {}, {
@@ -224,6 +226,10 @@ var _default = {
     handleCall: function handleCall(authlist, num) {
       var that = this;
       console.log("authlist", authlist, that.userInfo);
+      if (!that.token) {
+        that.$tools.msg("注册/登录后查看更多");
+        return;
+      }
       if (authlist.length) {
         var arr = authlist.findIndex(function (v) {
           return v.code == 'phone:show';

unpackage/dist/dev/mp-weixin/pageTwo/product/list.js

@@ -244,7 +244,7 @@ var _default = {
     handlefabu: function handlefabu() {
       var that = this;
       if (!uni.getStorageSync('token')) {
-        that.$tools.msg("登录后查看更多");
+        that.$tools.msg("注册/登录后查看更多");
         return;
       }
       var type = this.type == 3 ? 3 : this.active == 1 ? 8 : 9;
@@ -257,10 +257,10 @@ var _default = {
             url: "/pageTwo/me/addNeeds?status=add&type=" + type
           });
         } else {
-          that.$store.commit("changeSecratary", true);
+          that.$tools.msg("加入我们获得更多权限！");
         }
       } else {
-        that.$store.commit("changeSecratary", true);
+        that.$tools.msg("加入我们获得更多权限！");
       }
       console.log("发布", that.user.authlist);
     },
@@ -270,7 +270,7 @@ var _default = {
       var type = this.type == 3 ? 3 : this.active == 1 ? 8 : 9;
       console.log("详情", this.active);
       // if (!uni.getStorageSync('token')) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       that.$model.getProductDetail({
@@ -291,7 +291,7 @@ var _default = {
     handleSearch: function handleSearch(name, province, city, industryid) {
       var that = this;
       // if (!uni.getStorageSync('token')) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       this.name = name;

unpackage/dist/dev/mp-weixin/pages/index/fengCai.js

@@ -208,7 +208,7 @@ var _default = {
     handleSearch: function handleSearch(name) {
       var that = this;
       // if (!uni.getStorageSync('token')) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       this.name = name;
@@ -220,7 +220,7 @@ var _default = {
     handledetail: function handledetail(ite) {
       var that = this;
       // if (!uni.getStorageSync('token')) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -109,6 +109,14 @@ var render = function () {
   var g4 = _vm.newsList.length
   var g5 = _vm.newsList.length
   var g6 = _vm.newsList.length
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event) {
+      _vm.isShop = false
+    }
+    _vm.e1 = function ($event) {
+      _vm.isShop = false
+    }
+  }
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -191,7 +199,9 @@ var _default = {
   data: function data() {
     return {
       list: [],
-      token: ''
+      token: '',
+      shopId: "",
+      isShop: false
     };
   },
   computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(["user", "HomeContent", 'InfoList', "navbarlist"])), {}, {
@@ -316,7 +326,7 @@ var _default = {
     handleDetail: function handleDetail(ite) {
       var that = this;
       // if (!that.token) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       uni.navigateTo({
@@ -328,7 +338,7 @@ var _default = {
       var that = this;
       console.log("搜索信息返回", ite);
       // if (!that.token) {
-      // 	that.$tools.msg("登录后查看更多")
+      // 	that.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       if (ite != "") {
@@ -338,20 +348,15 @@ var _default = {
       }
     },
     // 工具栏跳转
-    handlePath: function handlePath(ind, url) {
+    handlePath: function handlePath(ind, ite) {
       var that = this;
-      this.navTo(url);
+      if (ite.link != "") {
-      // if (ind == 3) {
+        that.navTo(ite.link);
-      // 	uni.switchTab({
+      }
-      // 		url: url
+      if (ite.appid != "") {
-      // 	})
+        that.shopId = ite.appid;
-      // } else if (ind == 2) {
+        that.isShop = true;
-      // 	uni.navigateTo({
+      }
-      // 		url: url + "?content=2"
-      // 	})
-      // } else {
-      // 	this.navTo(url)
-      // }
     },
     // 轮播、公告、资讯详情
     detail: function detail(id, type) {

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -132,6 +132,7 @@
   flex-wrap: wrap;
   margin-top: 10px;
   padding-top: 10px;
+  overflow: hidden;
   border-radius: 10px;
   background-color: #fff;
 }
@@ -265,4 +266,26 @@
   border-radius: 5px;
   display: block;
 }
+.bg.data-v-57280228 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.bg .edit.data-v-57280228 {
+  border-radius: 5px;
+  height: 125px;
+  padding: 20px;
+  margin: 0 !important;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+}
+.bg .edit .close.data-v-57280228 {
+  width: 100px;
+  height: 35px;
+  line-height: 35px;
+  margin-top: 15px;
+  border-radius: 5px;
+  background-color: #eae7e7;
+}
 

unpackage/dist/dev/mp-weixin/pages/index/searchList.js

@@ -297,6 +297,10 @@ var _default = {
     handleCall: function handleCall(authlist, num) {
       var that = this;
       console.log("authlist", authlist, that.userInfo);
+      if (!uni.getStorageSync('token')) {
+        this.$tools.msg("注册/登录后查看更多");
+        return;
+      }
       if (authlist.length) {
         var arr = authlist.findIndex(function (v) {
           return v.code == 'phone:show';

unpackage/dist/dev/mp-weixin/pages/me/me.js

@@ -213,8 +213,8 @@ var _default = {
       this.$store.commit("changeSecratary", true);
     },
     handleisCare: function handleisCare() {
-      if (!this.token) {
+      if (!uni.getStorageSync('token')) {
-        this.$tools.msg("登录后查看更多");
+        this.$tools.msg("注册/登录后查看更多");
         return;
       }
       this.isCard = !this.isCard;
@@ -227,8 +227,8 @@ var _default = {
       });
     },
     navTo: function navTo(url) {
-      if (!this.token) {
+      if (!uni.getStorageSync('token')) {
-        this.$tools.msg("登录后查看更多");
+        this.$tools.msg("注册/登录后查看更多");
         return;
       }
       this.isCard = false;

unpackage/dist/dev/mp-weixin/pages/me/me.wxss

@@ -270,7 +270,7 @@
   height: 160rpx;
   position: absolute;
   right: 10px;
-  bottom: 30px;
+  bottom: 8px;
 }
 .Card .box .ercode .right image.data-v-259fb574 {
   width: 100%;

unpackage/dist/dev/mp-weixin/pages/phoneList/detail.js

@@ -276,6 +276,10 @@ var _default = {
     handleCall: function handleCall(authlist, num) {
       var that = this;
       console.log("authlist", authlist, that.userInfo);
+      if (!uni.getStorageSync('token')) {
+        this.$tools.msg("注册/登录后查看更多");
+        return;
+      }
       if (authlist.length) {
         var arr = authlist.findIndex(function (v) {
           return v.code == 'phone:show';

unpackage/dist/dev/mp-weixin/pages/phoneList/phoneList.js

@@ -229,7 +229,7 @@ var _default = {
     },
     handleSearch: function handleSearch(name, province, city, industryid) {
       // if (!this.token) {
-      // 	this.$tools.msg("登录后查看更多")
+      // 	this.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       this.name = name;
@@ -244,7 +244,7 @@ var _default = {
     // 详情
     handledetail: function handledetail(ite) {
       // if (!this.token) {
-      // 	this.$tools.msg("登录后查看更多")
+      // 	this.$tools.msg("注册/登录后查看更多查看更多")
       // 	return
       // }
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,6 +2,6 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "intelligentGroup",
   "setting": {
-    "compileHotReLoad": false
+    "compileHotReLoad": true
   }
 }