3-29-1

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "乐品优选",
-    "appid" : "__UNI__F0EBD91",
-    "description" : "",
+    "name" : "天美仕",
+    "appid" : "__UNI__CE920B0",
+    "description" : "天美仕",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -65,7 +65,7 @@
         }
     },
     "h5" : {
-        "title" : "乐品优选",
+        "title" : "天美仕",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -74,7 +74,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://yhyx.liuniu946.com/api",
+                    "target" : "http://tmr.liuniukj.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -2,7 +2,7 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "乐品优选",
+				"navigationBarTitleText": "天美仕",
 				"navigationStyle": "custom"
 			}
 		},
@@ -350,13 +350,13 @@
 		{
 			"path": "pages/user/yjzz",
 			"style": {
-				"navigationBarTitleText": "奖金转账"
+				"navigationBarTitleText": "转账"
 			}
 		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "乐品优选",
+		"navigationBarTitleText": "天美仕",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#f8f8f8"
 	},

pages/index/index.vue

@@ -57,12 +57,12 @@
 				</view>
 				<view class="item-title">联系客服</view>
 			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
+			<!-- <view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/in4.png" mode=""></image>
 				</view>
 				<view class="item-title">邀请好友</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- 分类 ed -->
 
@@ -236,6 +236,11 @@
 				});
 			}
 			// #endif
+			if(!this.hasLogin) {
+				uni.navigateTo({
+					url:'/pages/public/login'
+				})
+			}
 		},
 		onShow: function() {
 			this.getGoodList()

pages/money/pay.vue

@@ -5,14 +5,14 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
+			<!-- <view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view>
+			</view> -->
 			<!-- #ifdef APP-PLUS -->
 			<view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
@@ -43,12 +43,12 @@ import weichatObj from '@/plugin/jweixin-module/index.js';
 export default {
 	data() {
 		return {
-			payType: 1, //支付类型
+			payType: 3, //支付类型
 			// #ifdef H5
-			payName: 'weixin',
+			payName: 'yue',
 			// #endif
 			// #ifdef MP-WEIXIN
-			payName: 'weixin',
+			payName: 'yue',
 			// #endif
 			orderInfo: {},
 			money: 0.0, //订单金额

pages/public/login.vue

@@ -1,9 +1,13 @@
 <template>
 	<view class="container">
 		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
+			<!-- <image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image> -->
+			<view class="banner-img" style="background-color: #f63332;">
+				
+			</view>
 		</view>
-		<view class="loginTitle"><text>登录</text></view>
+		<view class="loginTitle"><text>登录</text></view>
+		
 		<view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
@@ -15,32 +19,9 @@
 			</view>
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
 			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
-			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
-			<view class="flex other">
-				<view class="fenge"></view>
-				<view class="qita">其他方式登录</view>
-				<view class="fenge"></view>
-			</view>
-			<!-- #ifndef APP-PLUS -->
-					<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<block v-if="!is_ios">
-						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
-						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					</block>
-					<block v-else>
-						<view class="ios_login flex" @click="wecahtLogin('weixin')">
-							<text class="iconfont iconweixin"></text>
-							<text class="weixin_text">微信登录</text>
-						</view>
-						<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
-							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
-							<text class="weixin_text">通过Apple登录</text>
-						</view>
-					</block>
-					<!-- #endif -->
+			<!-- <navigator url="./forget"><view class="forget">忘记密码</view></navigator> -->
+			
+			
 				</view>
 			</view>
 </template>
@@ -84,9 +65,17 @@ export default {
 				}
 			}
 		})
-		// #endif
+		// #endif
+		if(!uni.getStorageInfoSync('username')) {
+			
+		}else {
+			this.username = uni.getStorageSync('username')
+			this.passward = uni.getStorageSync('passward')
+		}
+		
+		
 	},
-	methods: {
+	methods: {
 		...mapMutations('user', ['setUserInfo', 'login']),
 		// 微信登录
 		wecahtLogin(type) {
@@ -194,9 +183,10 @@ export default {
 				account: obj.username,
 				password: obj.passward
 			})
-				.then(function(e) {
+				.then(function(e) {
+					uni.setStorageSync('username',obj.username)
+					uni.setStorageSync('passward',obj.passward)
 					uni.setStorageSync('token', e.data.token);
-					obj.$store.commit('hasLogin', true);
 					getUserInfo({}).then(e => {
 						obj.login();
 						// 保存返回用户数据
@@ -359,15 +349,15 @@ page {
 
 	.uni-button-green {
 		color: #ffffff;
-		background-color: #5dbc7c;
+		background-color: #ff4c4c;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}
 	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
+		border: 1px solid #ff4c4c;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
-		color: #5dbc7c;
+		color: #ff4c4c;
 		background-color: #ffffff;
 	}
 	.uni-button {

pages/public/register.vue

@@ -1,30 +1,37 @@
 <template>
 	<view class="container">
 		<view class="container_text" >
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
+			<!-- <image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image> -->
+			<view class="banner-img" style="background-color: #f63332;">
+				
+			</view>
 		</view>
 		<view class="loginTitle"><text>注册</text></view>
-		<view class="login_text">
+		<view class="login_text">
+			<view class="login_input flex">
+				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
+				<view class="login_name"><input class="uni-input" v-model="nickname" type="text" placeholder="请输入姓名"/></view>
+			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
+				<view class="login_name"><input class="uni-input" type="number" v-model="phone"  placeholder="请输入手机号" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus placeholder="请输入密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password"  placeholder="请输入密码" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="repassword"  placeholder="请重复输入密码" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
+				<view class="login_name"><input class="uni-input" type="number" v-model="invitation"  placeholder="请输入邀请人手机号" /></view>
 			</view>
-			<view class="login_input flex">
+			<view class="login_input flex" style="display: none;">
 				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
+					<input class="uni-input width" v-model="code" placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
 			</view>
@@ -37,12 +44,13 @@
 import { register, verify } from '@/api/login.js';
 export default {
 	data() {
-		return {
+		return {
+			nickname: '',//用户昵称
 			phone: '', //用户
 			password: '', //密码
 			repassword: '',
 			invitation: '', //邀请码
-			code: '', //验证码
+			code: '123456', //验证码
 			time: '', //保存倒计时对象
 			countDown: 0 ,//倒计时
 		};
@@ -62,7 +70,11 @@ export default {
 	methods: {
 		// 注册
 		register() {
-			let obj = this;
+			let obj = this;
+			if(obj.nickname == '') {
+				obj.$api.msg('请输入姓名');
+				return;
+			}
 			if (obj.phone == '') {
 				obj.$api.msg('请输入电话号码');
 				return;
@@ -83,15 +95,16 @@ export default {
 				obj.$api.msg('两次密码不正确');
 				return;
 			}
-			// if ((obj.invitation = '')) {
-			// 	obj.$api.msg('请输入邀请码');
-			// 	return;
-			// }
+			if ((obj.invitation == '')) {
+				obj.$api.msg('请输入邀请码');
+				return;
+			}
 			// if (obj.code == '') {
 			// 	obj.$api.msg('请输入验证码');
 			// 	return;
 			// }
-			register({
+			register({
+				nickname: obj.nickname,
 				account: obj.phone, //账号
 				captcha: obj.code, //验证码
 				password: obj.password ,//密码
@@ -229,15 +242,15 @@ page {
 
 	.uni-button-green {
 		color: #ffffff;
-		background-color: #5dbc7c;
+		background-color: #ff4c4c;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}
 	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
+		border: 1px solid #ff4c4c;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
-		color: #5dbc7c;
+		color: #ff4c4c;
 		background-color: #ffffff;
 	}
 	.uni-button {
@@ -265,7 +278,7 @@ page {
 	width: 325rpx !important;
 }
 .code {
-	color: #5dbc7c;
+	color: #ff4c4c;
 	font-size: 23rpx;
 	border-left: 1px solid #eeeeee;
 	width: 150rpx;

pages/set/userinfo.vue

@@ -5,12 +5,12 @@
 			<view class="background-img" @click="imgsub"><image class="background-img" v-model="userInfo.avatar" :src="userInfo.avatar" mode="aspectFill"></image></view>
 		</view>
 		<view class="row">
-			<text class="tit">昵称</text>
+			<text class="tit">姓名</text>
 			<input class="input" type="text" v-model="userInfo.nickname" placeholder-class="placeholder"/>
 		</view>
 		<view class="row">
-			<text class="tit">ID</text>
-			<input class="input" type="text"  disabled="true" v-model="userInfo.uid" placeholder-class="placeholder" />
+			<text class="tit">手机</text>
+			<input class="input" type="text"  disabled="true" v-model="userInfo.phone" placeholder-class="placeholder" />
 		</view>
 		<!-- <view class="row">
 			<text class="tit">账户</text>

pages/user/user.vue

@@ -11,9 +11,9 @@
 					@click="navTo('/pages/set/userinfo')"></image>
 				<image class="avatar" src="../../static/error/missing-face.png" mode="" v-else></image>
 				<view class="user-name-id">
-					<view class="user-name clamp2">{{ userInfo.nickname || '游客'}}</view>
+					<view class="user-name clamp2">{{ userInfo.phone || '游客'}}</view>
 					
-					<view class="user-uid" v-if="userInfo.uid">ID号:{{ userInfo.uid || ''}}</view>
+					<!-- <view class="user-uid" v-if="userInfo.uid">ID号:{{ userInfo.uid || ''}}</view> -->
 				</view>
 			</view>
 			<view class="user-money flex">
@@ -76,7 +76,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+		<!-- <view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
 			<view class="user-list-image">
 				<image src="../../static/icon/u1.png" mode="heightFix" class="left-img"></image>
 			</view>
@@ -84,7 +84,7 @@
 				邀请海报
 			</view>
 			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
-		</view>
+		</view> -->
 		<view class="user-list flex" @click="navTo('/pages/user/team')">
 			<view class="user-list-image">
 				<image src="../../static/icon/u2.png" mode="heightFix" class="left-img"></image>

pages/user/yjzz.vue

@@ -10,8 +10,8 @@
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">收款人UID</view>
-			<view class="row"><input class="input" type="number" v-model="phone" placeholder="请输入收款人UID"
+			<view class="title">收款人</view>
+			<view class="row"><input class="input" type="number" v-model="phone" placeholder="请输入收款人手机号"
 					placeholder-class="placeholder" /></view>
 		</view>
 		<view class="row-box">
@@ -105,10 +105,10 @@
 					return;
 				}
 				if(obj.phone == '') {
-					return obj.$api.msg('请输入用户UID')
+					return obj.$api.msg('请输入收款人手机号')
 				}
 				let data = {
-					uid: obj.phone, //编号
+					phone: obj.phone, //编号
 					price: obj.withdrawal ,//金额
 					// type: obj.type
 				};

store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://yhyx.liuniu946.com',//请求地址配置 
+		baseURL:'http://tmr.liuniukj.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>乐品优选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.69adbd1d.js></script><script src=/index/static/js/index.c5347e11.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>天美仕</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.69adbd1d.js></script><script src=/index/static/js/index.cb558777.js></script></body></html>