hwq 4 years ago
parent
commit
68b3aea567

+ 1 - 1
manifest.json

@@ -73,7 +73,7 @@
         "devServer" : {
         "devServer" : {
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
-                    "target" : "http://lt.frp.liuniu946.com/api",
+                    "target" : "http://tl.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     // "changeOrigin": true,
                     "pathRewrite" : {
                     "pathRewrite" : {
                         "/api" : "" // rewrite path
                         "/api" : "" // rewrite path

+ 7 - 1
pages.json

@@ -507,7 +507,7 @@
 	},
 	},
 	"tabBar": {
 	"tabBar": {
 		"color": "#C0C4CC",
 		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
+		"selectedColor": "#FF4C4C",
 		"borderStyle": "black",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"backgroundColor": "#ffffff",
 		"list": [{
 		"list": [{
@@ -522,6 +522,12 @@
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
 				"text": "分类"
 				"text": "分类"
 			},
 			},
+			{
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/tabBar/tab-cart.png",
+				"selectedIconPath": "static/tabBar/tab-cart-current.png",
+				"text": "购物车"
+			},
 			{
 			{
 				"pagePath": "pages/user/user",
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabBar/tab-my.png",
 				"iconPath": "static/tabBar/tab-my.png",

+ 1 - 1
pages/public/login.vue

@@ -192,7 +192,7 @@ export default {
 			}
 			}
 			login({
 			login({
 				account: obj.username,
 				account: obj.username,
-				password: obj.passward
+				password: obj.passward,
 			})
 			})
 				.then(function(e) {
 				.then(function(e) {
 					uni.setStorageSync('token', e.data.token);
 					uni.setStorageSync('token', e.data.token);

+ 2 - 1
pages/public/register.vue

@@ -95,7 +95,8 @@ export default {
 				account: obj.phone, //账号
 				account: obj.phone, //账号
 				// captcha: obj.code, //验证码
 				// captcha: obj.code, //验证码
 				password: obj.password ,//密码
 				password: obj.password ,//密码
-				spread:this.invitation//上级推广人
+				spread:this.invitation,//上级推广人
+				captcha:'123456'
 			}).then(function(e) {
 			}).then(function(e) {
 				uni.showToast({
 				uni.showToast({
 					title:'注册成功',
 					title:'注册成功',

BIN
static/tabBar/dingdan.png


BIN
static/tabBar/home.png


BIN
static/tabBar/tab-cart-current.png


BIN
static/tabBar/tab-cart.png


BIN
static/tabBar/tab-cate-current.png


BIN
static/tabBar/tab-cate.png


BIN
static/tabBar/tab-home-current.png


BIN
static/tabBar/tab-home.png


BIN
static/tabBar/tab-my-current.png


BIN
static/tabBar/tab-my.png


+ 1 - 1
store/index.js

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