jp

.hbuilderx/launch.json

@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

App.vue

@@ -124,7 +124,6 @@ video {
 		}
 	}
 }
-
 // 设置富文本中图片最大宽度
 uni-rich-text img {
 	max-width: 100% !important;

api/login.js

@@ -54,11 +54,4 @@ export function loginWx(data) {
 	});
 }
 // #endif
-//绑定手机号
-export function bangding(data) {
-	return request({
-		url: '/api/binding',
-		method: 'POST',
-		data
-	});
-}
+

libs/log.js

@@ -1,39 +0,0 @@
-
-const logLength=100;//缓存存储上限
-const name = 'log';//缓存名字
-export function addLog (data,content='') {
-	let log = uni.getStorageSync(name)||[];
-	log.unshift({
-		title:data,
-		content:content
-	});
-	uni.setStorageSync(name,log);
-	initLog(log);
-}
-
-
-export function delLog () {
-	return uni.setStorageSync(name,'');
-}
-
-export function getLog () {
-	return uni.getStorageSync(name);
-}
-
-export function initLog (log) {
-	if(log.length>logLength){
-		const newarr = log.slice(log.length-logLength);
-		uni.setStorageSync(name,newarr);
-	}
-}
-export function showLog (log) {
-	
-	let str = '';
-	uni.getStorageSync(name).forEach((e) => {
-		str+=e.title+':'+JSON.stringify(e.content)
-	})
-	uni.showModal({
-		title:"日志",
-		content:str
-	})
-}

libs/login.js

@@ -1,20 +1,13 @@
 import store from "../store";
 import Cache from '../utils/cache';
 // #ifdef H5 || APP-PLUS
-import {
-	isWeixin
-} from "../utils";
+import { isWeixin } from "../utils";
 import auth from './wechat';
 // #endif
 
-import {
-	LOGIN_STATUS,
-	USER_INFO,
-	EXPIRES_TIME,
-	STATE_R_KEY
-} from './../config/cache';
+import { LOGIN_STATUS, USER_INFO, EXPIRES_TIME, STATE_R_KEY} from './../config/cache';
 
-function prePage() {
+function prePage(){
 	let pages = getCurrentPages();
 	let prePage = pages[pages.length - 2];
 	// #ifdef H5
@@ -26,57 +19,58 @@ function prePage() {
 export function toLogin(push, pathLogin) {
 	// store.commit("LOGOUT");
 	let path = prePage();
-	if (path) {
+	if(path){
 		path = path.router;
-		if (path == undefined) {
+		if(path == undefined){
 			path = location.pathname;
 		}
-	}
-	// #ifdef H5
-	else {
+	}  
+		// #ifdef H5
+	else{
 		path = location.pathname;
-	}
-	// #endif
-
-	if (!pathLogin)
+	} 
+		// #endif
+		
+	if(!pathLogin)
 		pathLogin = '/page/users/login/index'
-	Cache.set('login_back_url', path);
+	Cache.set('login_back_url',path);
 	// #ifdef H5 || APP-PLUS
 	if (isWeixin()) {
 		auth.oAuth();
 	} else {
 		if (path !== pathLogin) {
-			push ? uni.navigateTo({
-				url: '/pages/users/login/index'
-			}) : uni.reLaunch({
-				url: '/pages/users/login/index'
-			});
+		 push ? uni.navigateTo({
+		 	url:'/pages/users/login/index'
+		 }) : uni.reLaunch({
+		 	url: '/pages/users/login/index'
+		 });
 		}
 	}
 	// #endif
-
+	
 	// #ifdef MP 
-
-
+	
+	
 	// #endif
 }
 
 
-export function checkLogin() {
+export function checkLogin()
+{
 	let token = Cache.get(LOGIN_STATUS);
 	let expiresTime = Cache.get(EXPIRES_TIME);
 	let newTime = Math.round(new Date() / 1000);
-	if (expiresTime < newTime || !token) {
+	if (expiresTime < newTime || !token){
 		Cache.clear(LOGIN_STATUS);
 		Cache.clear(EXPIRES_TIME);
 		Cache.clear(USER_INFO);
 		Cache.clear(STATE_R_KEY);
 		return false;
-	} else {
-		store.commit('UPDATE_LOGIN', token);
-		let userInfo = Cache.get(USER_INFO, true);
-		if (userInfo) {
-			store.commit('UPDATE_USERINFO', userInfo);
+	}else{
+		store.commit('UPDATE_LOGIN',token);
+		let userInfo = Cache.get(USER_INFO,true);
+		if(userInfo){
+			store.commit('UPDATE_USERINFO',userInfo);
 		}
 		return true;
 	}

manifest.json

@@ -68,18 +68,10 @@
         "domain" : "",
         "router" : {
             "base" : "/index/",
-            "mode" : "hash"
+            "mode" : "history"
         },
         "devServer" : {
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://192.168.0.101/api",
-                    // "changeOrigin": true,
-                    "pathRewrite" : {
-                        "/api" : "" // rewrite path
-                    }
-                }
-            }
+            "port" : ""
         }
     }
 }

node_modules/jweixin-module/README.md

@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var wx = require('jweixin-module')
+wx.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)

node_modules/jweixin-module/package.json

@@ -0,0 +1,60 @@
+{
+  "_from": "jweixin-module",
+  "_id": "jweixin-module@1.4.1",
+  "_inBundle": false,
+  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "jweixin-module",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
+  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
+  "_spec": "jweixin-module",
+  "_where": "D:\\工作\\项目\\appBase",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {
+    "textfile": "^1.2.0",
+    "uglify-js": "^3.4.9"
+  },
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "out/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {
+    "build": "node build",
+    "prepublish": "npm run build"
+  },
+  "version": "1.4.1"
+}

package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "jweixin-module": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
+      "integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg=="
+    }
+  }
+}

pages.json

@@ -9,31 +9,31 @@
 				// #ifndef MP
 				"app-plus": {
 					"titleNView": {
-						"type": "transparent",
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						},
-						"buttons": [{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue60d",
-								"fontSize": "26",
-								"color": "#303133",
-								"float": "left",
-								"background": "rgba(0,0,0,0)"
-							},
-							{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue744",
-								"fontSize": "27",
-								"color": "#303133",
-								"background": "rgba(0,0,0,0)"
-							}
-						]
+						"type": "transparent"
+						// "searchInput": {
+						// 	"backgroundColor": "rgba(231, 231, 231,.7)",
+						// 	"borderRadius": "16px",
+						// 	"placeholder": "请输入关键词搜索",
+						// 	"disabled": true,
+						// 	"placeholderColor": "#fff",
+						// 	"align": "center"
+						// }
+						// "buttons": [{
+						// 		"fontSrc": "/static/yticon.ttf",
+						// 		"text": "\ue60d",
+						// 		"fontSize": "26",
+						// 		"color": "#303133",
+						// 		"float": "left",
+						// 		"background": "rgba(0,0,0,0)"
+						// 	},
+						// 	{
+						// 		"fontSrc": "/static/yticon.ttf",
+						// 		"text": "\ue744",
+						// 		"fontSize": "27",
+						// 		"color": "#303133",
+						// 		"background": "rgba(0,0,0,0)"
+						// 	}
+						// ]
 					}
 				},
 				// #endif

pages/activity/goods_bargain_details/index.vue

@@ -226,7 +226,7 @@ import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 // import authorize from '@/components/Authorize';
 // #endif
 import countDown from '@/components/countDown';
-import uniCopy from '@/utils/uni-copy.js';
+import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 // import home from '@/components/home';
 import parser from '@/components/jyf-parser/jyf-parser';
 import { silenceBindingSpread } from '@/utils';

pages/category/category.vue

@@ -24,7 +24,7 @@ export default {
 		return {
 			sizeCalcState: false,
 			tabScrollTop: 0,
-			currentId: 9,
+			currentId: 1,
 			flist: [],
 		};
 	},
@@ -60,9 +60,7 @@ export default {
 			}
 			// 获取当前点击的id
 			this.currentId = item.id;
-			console.log(item.top);
 			this.tabScrollTop = item.top;
-			console.log(this.tabScrollTop);
 		},
 		//右侧栏滚动
 		asideScroll(e) {

pages/index/child/hotGoods.vue

@@ -0,0 +1,135 @@
+<template>
+	<view class="">
+		<view class="goods-top">
+		<image src="@/static/icon/jxgoods.png" mode=""></image>
+		<text>精选好物</text><text>买多赚多</text>
+	</view>
+	<view class="goods-list">
+		<view class="goods-list-top">
+				<view class="goods-list-title">
+					<text>精选好货 平台推荐</text><br>
+					<text>买到就是赚到</text>
+				</view>
+				<view class="goods-list-more">
+					<image src="@/static/icon/more.png"></image>
+				</view>
+		</view>
+		<view class="list">
+			<view class="list-g">
+				<view class="scroll-boxs">
+					<scroll-view scroll-x :scrollLeft="scrollLeft" @scroll="scroll" class="right-head"  style="white-space: nowrap">
+					    <view  class="goods-item" >
+							<view class="item-img">
+								<image src="../../../static/error/errorImage.jpg" mode=""></image>
+							</view>
+							<text class="clamp">学芝灵雪莲贴...</text>
+							<text class="ot-price">￥289</text>
+							<text class="price">￥99</text>
+						</view>
+						<view  class="goods-item" >
+							<view class="item-img">
+								<image src="../../../static/error/errorImage.jpg" mode=""></image>
+							</view>
+							<text>学芝灵雪莲贴</text>
+							<text class="ot-price">￥289</text>
+							<text class="price">￥99</text>
+						</view>
+						<view  class="goods-item" >
+							<view class="item-img">
+								<image src="../../../static/error/errorImage.jpg" mode=""></image>
+							</view>
+							<text class="clamp">学芝灵雪莲贴学芝灵雪莲贴</text>
+							<text class="ot-price">￥289</text>
+							<text class="price">￥99</text>
+						</view>
+					</scroll-view>
+				</view>
+				    
+			</view>
+		</view>
+	</view>
+	</view>
+	
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	.goods-top {
+		image {
+			position: absolute;
+			width: 45rpx;
+			height: 45rpx;
+		}
+		text:nth-child(2) {
+			margin:0 10rpx 0 60rpx;
+			color: #333333;
+			font-size: 32rpx;
+			font-weight: bold;
+			font-family: PingFang-SC-Bold;
+		}
+		text:nth-child(3) {
+			color: #95A0B1;
+			font-size: 18rpx;
+		}
+	}
+	.goods-list-top {
+		margin-top: 20rpx;
+		padding: 20rpx;
+		padding-bottom: 65rpx;
+		border-radius: 15rpx 15rpx 0 0;
+		background:-moz-linear-gradient(top,#438BED,#45BDEB);/*火狐*/ 
+		background:-webkit-gradient(linear, 0% 0%, 100% 100%,from(#438BED), to(#45BDEB));/*谷歌*/
+		background: linear-gradient(to right, #438BED, #45BDEB);
+		color: #fff;
+		display: flex;
+		justify-content: space-between;
+		.goods-list-title {
+			text:nth-child(1) {
+				font-size: 32rpx;
+			}
+			text:nth-child(3) {
+				font-size: 20rpx;
+			}
+		}
+		.goods-list-more {
+			margin: auto 0;
+			image {
+				width: 14rpx;
+				height: 28rpx;
+			}
+		}
+	}
+	.list {
+		background-color: #F4F4F4;
+		.list-g {
+			border-radius: 15rpx;
+			position: relative;
+			top: -50rpx;
+			background-color: #F4F4F4;
+			margin: 0 10rpx;
+			white-space: nowrap;
+			overflow: hidden;
+			.goods-item {
+				border-left:solid 1rpx #F4F4F4;
+				border-right:solid 1rpx #F4F4F4;
+				padding: 20rpx;
+				background-color: #fff;
+				display: inline-block;
+				text {
+					max-width: 200rpx;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1
+				}
+				.item-img {
+					image {
+						width: 200rpx;
+						height: 200rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -11,48 +11,84 @@
 		<view class="mp-height"></view>
 		<!-- #endif -->
 		<!-- 头部轮播 -->
-		<view class="carousel-section">
+		<!-- <view class="headerInput" >
+			<input type="text" placeholder="请输入搜索内容"/>
+		</view> -->
+		<view class="carousel-section" style="background-color: #fff;">
+			<view class="headerInput">
+				<input type="text" value="" placeholder="请输入搜索内容" />
+			</view>
 			<!-- 标题栏和状态栏占位符 -->
 			<view class="titleNview-placing"></view>
 			<!-- 背景色区域 -->
-			<view class="titleNview-background" :style="{ backgroundColor: '#5DBC7C' }"></view>
+			<view class="titleNview-background">
+				<image src="../../static/img/index-bg.png"></image>
+			</view>
 			<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
 				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)"><image :src="item.pic" /></swiper-item>
 			</swiper>
 			<!-- 自定义swiper指示器 -->
-			<view class="swiper-dots">
+			<!-- <view class="swiper-dots">
 				<text class="num">{{ swiperCurrent + 1 }}</text>
 				<text class="sign">/</text>
 				<text class="num">{{ swiperLength }}</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 分类 -->
 		<view class="cate-section">
 			<view class="cate-item">
-				<image src="/static/icon/c3.png"></image>
-				<text>联盟礼包</text>
+				<image src="/static/icon/in1.png"></image>
+				<text>全部分类</text>
 			</view>
 			<navigator url="/pages/product/groupBooking/index">
 				<view class="cate-item">
-					<image src="/static/icon/c5.png"></image>
-					<text>超值拼团</text>
+					<image src="/static/icon/in2.png"></image>
+					<text>热销专区</text>
 				</view>
 			</navigator>
 			<navigator url="/pages/product/seckill">
 				<view class="cate-item">
-					<image src="/static/icon/c7.png"></image>
-					<text>限时秒杀</text>
+					<image src="/static/icon/in3.png"></image>
+					<text>充值送积分</text>
 				</view>
 			</navigator>
 			<navigator url="/pages/index/sign">
 				<view class="cate-item">
-					<image src="/static/icon/c8.png"></image>
-					<text>每日签到</text>
+					<image src="/static/icon/in4.png"></image>
+					<text>邀请有礼</text>
 				</view>
 			</navigator>
 		</view>
 		
-		<view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view>
+		<!-- 精选好物 -->
+		<view class="goods">
+			<hot-goods></hot-goods>
+			<!-- <view class="goods-top">
+				<image src="../../static/icon/jxgoods.png" mode=""></image>
+				<text>精选好物</text><text>买多赚多</text>
+			</view>
+			<view class="goods-list">
+				<view class="goods-list-top">
+						<view class="goods-list-title">
+							<text>精选好货 平台推荐</text><br>
+							<text>买到就是赚到</text>
+						</view>
+						<view class="goods-list-more">
+							<image src="../../static/icon/more.png"></image>
+						</view>
+				</view>
+				<view class="list">
+					<view class="list-g">
+						<scroll-view class="scroll-x" :scroll-x="true">
+							<view>A</view>
+							<view>B</view>
+							<view>C</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view> -->
+		</view>
+		<!-- <view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view> -->
 		<!-- 可领取优惠券 -->
 		<!-- <scroll-view class="coupon-box clamp" :scroll-x="true">
 			<view v-for="(item, index) in couponArray" :key="item.id" class="coupon-list">
@@ -80,30 +116,30 @@
 					</view>
 				</view>
 			</view>
-		</scroll-view> -->
-
+		</scroll-view>
+ -->
 		<!-- 秒杀楼层 -->
-		<seckill></seckill>
+		<!-- <seckill></seckill> -->
 		<!-- 砍价 -->
-		<view class="hot-goods">
-			<view class="hot-headers flex-upDown-center">
+		<!-- <view class="hot-goods"> -->
+			<!-- <view class="hot-headers flex-upDown-center"> -->
 				<!-- <image class="img" src="../../static/img/img44.png"></image> -->
-				<view class="hot-title">超值砍价</view>
+				<!-- <view class="hot-title">超值砍价</view>
 				<view><view class="more" @click.stop="navTo('/pages/activity/goods_bargain/index')">更多</view></view>
-			</view>
-			<view class="hot-lists" v-for="(baritem, barindex) in bargainlist" :key="barindex" @click.stop="navToDetailPages(baritem)">
+			</view> -->
+			<!-- <view class="hot-lists" v-for="(baritem, barindex) in bargainlist" :key="barindex" @click.stop="navToDetailPages(baritem)">
 				<view class="hot-produce">
 					<view class="produce-image"><image :src="baritem.image"></image></view>
 					<view class="produce-content">
 						<view class="produce-price1 ">
 							<view class="produce-name line2">{{ baritem.title }}</view>
-							<!-- <view class="produce-info">
+							<view class="produce-info">
 								已抢
 								<text style="color: #FF383E">{{ baritem.sales }}</text>
 								箱/仅剩
 								<text style="color:#FF383E">{{ baritem.stock }}</text>
 								箱
-							</view> -->
+							</view>
 							<view class="produce-center">
 								<view class="kanjia_word">
 									<view class="word-1">原价:￥{{ baritem.price }}</view>
@@ -122,9 +158,9 @@
 							</view>
 						</view>
 					</view>
-				</view>
-			</view>
-		</view>
+				</view> -->
+			<!-- </view> -->
+		<!-- </view> -->
 		<!-- 拼团楼层 -->
 
 		<view class="recommend flex">
@@ -180,7 +216,7 @@
 					<view class="guess-section">
 						<view v-for="(item, index) in bastBanner" :key="index" class="guess-item" @click="navToDetailPage(item)">
 							<navigator :url="item.link">
-								<view class="image-wrappe r"><image :src="item.image" mode="scaleToFill"></image></view>
+								<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
 								<text class="title clamp margin-c-20">{{ item.store_name }}</text>
 								<view class="cmy-hr"></view>
 								<view class="price margin-c-20 flex">
@@ -329,6 +365,7 @@
 
 <script>
 import seckill from '../../components/seckill/seckill.vue';
+import hotGoods from './child/hotGoods.vue';
 import { loadIndexs } from '@/api/index.js';
 import { getUserInfo } from '@/api/user.js';
 import { setCoupons } from '@/api/functionalUnit.js';
@@ -338,7 +375,8 @@ import { mapState } from 'vuex';
 
 export default {
 	components: {
-		seckill
+		seckill,
+		hotGoods
 	},
 	watch: {
 		//自适应swiper高度
@@ -655,6 +693,24 @@ export default {
 </script>
 
 <style lang="scss">
+	//搜索栏
+	.headerInput {
+		z-index: 9;
+		background-color: rgba(255,255,255,0.8);
+		border-radius: 25rpx;
+		padding: 5rpx 28rpx;
+		width: 90%;
+		position: relative;
+		top: 30px;
+		left: 5%;
+		text-align: center;
+	}
+	//精选好物
+	.goods {
+		margin-top: 20rpx;
+		background-color: #fff;
+		padding: 40rpx 5%;
+	}
 .Mask {
 	width: 100%;
 	height: 100vh;
@@ -874,8 +930,12 @@ page {
 		top: 0;
 		left: 0;
 		width: 100%;
-		height: 426rpx;
-		transition: 0.4s;
+		image {
+			// imsisize: 100%;
+			// height: 100%;
+			width: 100%;
+			margin-top: -100rpx;
+		}
 	}
 	.carousel {
 		width: 100%;
@@ -925,6 +985,7 @@ page {
 }
 /* 分类 */
 .cate-section {
+	background-color: #fff;
 	display: flex;
 	justify-content: space-around;
 	align-items: center;
@@ -934,16 +995,14 @@ page {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
+		font-size: 12rpx;
+		color: #333333;
 	}
 	/* 原图标颜色太深,不想改图了,所以加了透明度 */
 	image {
-		width: 88rpx;
-		height: 88rpx;
-		margin-bottom: 14rpx;
+		width: 120rpx;
+		height: 120rpx;
 		border-radius: 50%;
-		opacity: 0.7;
 	}
 }
 // 中间广告图片

pages/order/createOrder.vue

@@ -283,7 +283,6 @@ export default {
 				addressId: this.addressData.id //地址编号
 			})
 				.then(({ data }) => {
-					console.log(data,'111');
 					this.payType = true;
 					this.integralShow = true;
 					// 获取支付金额
@@ -519,6 +518,7 @@ page {
 			padding-left: 24rpx;
 			overflow: hidden;
 		}
+
 		.title {
 			font-size: 30rpx;
 			color: $font-color-dark;

pages/product/groupBooking/productCollage.vue

@@ -25,7 +25,7 @@
 			<view class="title" >{{goodsObjact.title}}</view>
 			<view class="bot-row flex1">
 				<view>快递：¥ {{goodsObjact.postage}}</view>
-				<view>剩余：{{ goodsObjact.allStock}}件</view>
+				<view>剩余：{{ goodsObjact.quota}}件</view>
 				<view>销量：{{ goodsObjact.sales }}</view>
 			</view>
 		</view>
@@ -380,8 +380,7 @@ export default {
 			option: '', //保存传值
 			opt: '', //保存小程序传值
 			uniquetype:false,//判断是否是从拼团详情界面跳回的 false 不是  true 是 
-			shop:'',//返回的拼团订单id
-			allStock:0//商品总库存
+			shop:''//返回的拼团订单id
 		};
 	},
 	onLoad(option) {
@@ -444,11 +443,6 @@ export default {
 			let goods = data.storeInfo;
 			obj.imgList = goods.images;//拼团轮播图
 			obj.goodsObjact = goods;//拼团拼团产品信息
-			// 保存商品总库存
-			obj.allStock = 0;
-			for(let key in 	data.productValue){
-				obj.allStock +=data.productValue[key].stock
-			}
 			obj.pinkTlist = data.pink;//进行中的拼团的信息
 			obj.showlist = obj.pinkTlist.slice(0, 2);//截取拼团信息的前两组
 			obj.replyCount = data.replyCount;//评价总数

pages/product/groupBooking/productGroup.vue

@@ -338,12 +338,11 @@
 					obj.goodsNumberMax = obj.productValue[str].stock;
 					obj.actionImage = obj.productValue[str].image;
 					obj.uniqueId = obj.productValue[str].unique;
-					obj.goodsStore = obj.productValue[str].stock;
-					// if (obj.goodsType == 2) {
-					// 	obj.goodsStore = obj.productValue[str].quota;
-					// } else {
-					// 	obj.goodsStore = obj.productValue[str].product_stock;
-					// }
+					if (obj.goodsType == 2) {
+						obj.goodsStore = obj.productValue[str].quota;
+					} else {
+						obj.goodsStore = obj.productValue[str].product_stock;
+					}
 				} else {
 					(obj.buys_show = false), (obj.buys_shows = true);
 				}

pages/product/product.vue

@@ -173,6 +173,7 @@ export default {
 			uni.setStorageSync('spread', options.spread);
 		}
 		saveUrl();
+		// 判断是否为秒杀商品
 		this.goodsDetail();
 		// 注册邀请信息
 		// #ifdef H5
@@ -223,7 +224,7 @@ export default {
 			let obj = this;
 			obj.specSelected[ind] = item.attr;
 			let str = obj.specSelected.join(',');
-			// 获取当前选中的对象
+			console.log(obj.productValue[str], 116);
 			if (obj.productValue[str]) {
 				obj.buys_show = true;
 				obj.buys_shows = false;
@@ -231,21 +232,20 @@ export default {
 				obj.goodsNumberMax = obj.productValue[str].stock;
 				obj.actionImage = obj.productValue[str].image;
 				obj.uniqueId = obj.productValue[str].unique;
-				obj.goodsStore = obj.productValue[str].stock;
+				if (obj.goodsType == 2) {
+					obj.goodsStore = obj.productValue[str].quota;
+				} else {
+					obj.goodsStore = obj.productValue[str].product_stock;
+				}
 			} else {
 				(obj.buys_show = false), (obj.buys_shows = true);
 			}
-			if (obj.goodsStore == 0) {
-				obj.buys_show = false;
-				obj.buys_shows = true;
-			}
-			obj.specSelected[ind] = item.attr;
 		},
 		// 打開彈窗
-		specOPne(type = 1) {
+		specOPne(type=1) {
 			let obj = this;
 			obj.specClass = 'show';
-			obj.type = type;
+			obj.type = type
 		},
 		//规格弹窗开关
 		toggleSpec(str) {
@@ -331,6 +331,7 @@ export default {
 					let str = obj.specSelected.join(',');
 					console.log(str, 'str');
 					// 设置默认值
+
 					obj.actionPrice = obj.productValue[str].price;
 					obj.goodsNumberMax = obj.productValue[str].stock;
 					obj.actionImage = obj.productValue[str].image;
@@ -338,11 +339,11 @@ export default {
 					obj.goodsStore = obj.productValue[str].quota;
 				} else {
 					obj.many = 1;
-					obj.productValue = data.productValue; //保存分类查询数据
-					obj.actionPrice = goods.price; //保存默认选中商品价格
-					obj.actionImage = goods.image_base; //保存默认选中商品图片
-					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
 				}
+				obj.productValue = data.productValue; //保存分类查询数据
+				obj.actionPrice = goods.price; //保存默认选中商品价格
+				obj.actionImage = goods.image_base; //保存默认选中商品图片
+				obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
 				obj.shopId = data.mer_id; //保存商店id
 			});
 		},
@@ -351,12 +352,12 @@ export default {
 			let obj = this;
 			// 创建传值对象
 			let data = {
-				cartNum: obj.goodsNumber, //商品数量
-				new: 1,
-				productId: obj.goodsid, //商品编号
-				uniqueId: obj.uniqueId
-			};
-
+					cartNum: obj.goodsNumber, //商品数量
+					new: 1,
+					productId: obj.goodsid,//商品编号
+					uniqueId:obj.uniqueId
+				};
+			
 			if (obj.type == 2) {
 				data.new = 0;
 			}
@@ -378,7 +379,7 @@ export default {
 						});
 						obj.goodsDetail();
 					}
-					obj.toggleSpec();
+					obj.toggleSpec()
 				})
 				.catch(e => {
 					console.log(e);

pages/product/seckill.vue

@@ -143,7 +143,7 @@ export default {
 			// 获取数据对象
 			let date = this.indexList[ind];
 			console.log(date, source);
-			if (source === 'tabChange' && date.loaded === true) {              
+			if (source === 'tabChange' && date.loaded === true) {
 				//tab切换只有第一次需要加载数据
 				return;
 			}

pages/public/wxLogin.vue

@@ -28,6 +28,7 @@
 import { loginWinxin } from '@/utils/wxAuthorized';
 // #endif
 // #ifdef MP-WEIXIN
+import { loginWinxinMp } from '@/utils/wxMinProgram';
 import { wechatMpAuth } from '@/api/wx';
 // #endif
 import { mapMutations } from 'vuex';
@@ -53,40 +54,10 @@ export default {
 		// #ifndef H5
 		// 用户确认授权
 		userInfoData(e) {
-			const that = this;
+			this.userInfo = e;
 			// #ifdef MP-WEIXIN
 			if (!this.loding) {
-				uni.showModal({
-					title: '温馨提示',
-					content: '亲，授权微信登录后才能正常使用小程序功能',
-					success: res => {
-						if (res.confirm) {
-							wx.getUserProfile({
-								desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-								success: res => {
-									that.userInfo = res;
-									that.loadMp();
-								},
-								fail: err => {
-									uni.showToast({
-										title: '您拒绝了请求,不能正常使用小程序',
-										icon: 'error',
-										duration: 2000
-									});
-									return;
-								}
-							});
-						} else if (res.cancel) {
-							//如果用户点击了取消按钮
-							uni.showToast({
-								title: '您拒绝了请求,不能正常使用小程序',
-								icon: 'error',
-								duration: 2000
-							});
-							return;
-						}
-					}
-				});
+				this.loadMp();
 			}
 			// #endif
 		},
@@ -99,36 +70,28 @@ export default {
 			let user = obj.userInfo;
 			// 获取推广人id
 			let spread_spid = uni.getStorageSync('spread') || '';
-			// let spread_code = uni.getStorageSync('spread_code') || '';
 			uni.showLoading({
 				title: '授权中',
-				mask: true
+				mask:true
 			});
-			wx.login({
-				success(e) {
-					wechatMpAuth({
-						code: e.code,
-						iv: user.iv,
-						encryptedData: user.encryptedData,
-						spread_spid: spread_spid,
-						// #ifdef MP
-						spread_code: spread_code
-						// #endif
+			loginWinxinMp().then(e => {
+				this.code = e.code;
+				wechatMpAuth({
+					code: this.code,
+					iv: user.target.iv,
+					encryptedData: user.target.encryptedData,
+					spread_spid: spread_spid
+				})
+					.then(({ data }) => {
+						obj.loding = false;
+						obj.wchatAuth(data);
 					})
-						.then(({ data }) => {
-							obj.loding = false;
-							obj.wchatAuth(data);
-							console.log(data);
-						})
-						.catch(e => {
-							obj.loding = false;
-							uni.hideLoading();
-						});
-				},
-				fill: function(e) {
-					obj.loding = false;
-					console.log(e);
-				}
+					.catch(e => {
+						obj.loding = false;
+						uni.hideLoading();
+					});
+			}).catch((e) => {
+				uni.hideLoading();
 			});
 		},
 		wchatAuth(data) {
@@ -180,7 +143,7 @@ export default {
 			let obj = this;
 			obj.MaskShow = false;
 			(obj.iv = e.detail.iv), (obj.encryptedData = e.detail.encryptedData);
-
+		
 			uni.setStorageSync('code', obj.code);
 			bangding({
 				flag: 1,

pages/user/award.vue

@@ -3,32 +3,32 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>		
+				<view class="money">{{ money | getMoneyStyle }}</view>
 			</view>
 			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
 			<view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
+					<view class="icon"><image class="icon-img" src="/static/icon/i6.png" mode="aspectFit"></image></view>
 					<text>统计</text>
 				</view>
 				<view class="interval"></view>
 				<view class="buttom" @click="navto('./withdrawal')">
-					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
+					<view class="icon"><image class="icon-img" src="/static/icon/i7.png" mode="aspectFit"></image></view>
 					<text>提现</text>
 				</view>
 			</view>
 		</view>
 		<view class="navbar">
-			<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 		<swiper :current="tabCurrentIndex" :style="{'height':maxheight+'px'}" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					
+
 					<!-- 订单列表 -->
-					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
 						<view class="title-box">
 							<view class="title">
 								<text>{{ item.title }}</text>
@@ -63,18 +63,19 @@ export default {
 		uniLoadMore
 	},
 	onReady() {
-		//初始化获取页面宽度
-		uni.createSelectorQuery().select('.content')
+		// 初始化获取页面宽度
+		uni.createSelectorQuery()
+			.select('.content')
 			.fields(
-			{
-				size:true
-			},
-			data => {
-				console.log(data);
-				console.log(Math.floor((data.width /750) * 300));
-				//保存头部高度
-				this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-				console.log(this.maxheight);
+				{
+					size: true
+				},
+				data => {
+					console.log(data);
+					console.log(Math.floor((data.width / 750) * 300));
+					// 保存头部高度
+					this.maxheight =data.height - Math.floor((data.width / 750) * 570);
+					console.log(this.maxheight);
 				}
 			)
 			.exec();
@@ -90,7 +91,7 @@ export default {
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页面
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
 				{
@@ -98,9 +99,9 @@ export default {
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页面
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				},
+				}
 			],
 			money: ''
 		};
@@ -108,19 +109,21 @@ export default {
 	onLoad(options) {},
 	onShow() {
 		this.loadData();
-		//获取用户余额
+		// 获取用户余额
 		userBalance({}).then(({ data }) => {
 			this.money = data.commissionCount;
 		});
 	},
 	methods: {
+		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
 				url: e
 			});
 		},
+		//获取收入支出信息
 		async loadData(source) {
-			//这里时将订单挂载到tab列表下
+			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
 			let state = navItem.state+3;
@@ -132,9 +135,9 @@ export default {
 				//防止重复加载
 				return;
 			}
-			//修改当前对象状态为加载中
+			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-			
+
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -143,16 +146,17 @@ export default {
 				state
 			)
 				.then(({ data }) => {
-					if(data.length > 0) {
+					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data[0].list);
 						console.log(navItem.orderList);
 						navItem.page++;
 					}
-					//判断是否还有数据, 有改为more, 没有改为noMore
 					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
 					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'noMore';
 					}
 					uni.hideLoading();
@@ -162,6 +166,7 @@ export default {
 					console.log(e);
 				});
 		},
+
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -172,7 +177,7 @@ export default {
 			this.tabCurrentIndex = index;
 		}
 	}
-}
+};
 </script>
 
 <style lang="scss">
@@ -188,7 +193,7 @@ page {
 		top: 150rpx;
 		right: 0rpx;
 		width: 150rpx;
-		padding: 10rpx 30rpx;
+		padding:10rpx 30rpx;
 		border: 2px solid #FFFFFF;
 		border-top-left-radius: 99rpx;
 		border-bottom-left-radius: 99rpx;
@@ -270,7 +275,7 @@ page {
 		}
 	}
 }
-//列表
+// 列表
 
 .swiper-box {
 	padding-top: 10rpx;

pages/user/coupon.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="navbar">
-			<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -11,7 +11,7 @@
 					<view class="list-money flex">
 						<image :src="item._type == 2 ? '/static/img/img03.png' : '/static/img/img02.png'" mode="scaleToFill"></image>
 						<view class="list-money-text">
-							<view class="tit" :class="{ action: item._type} == 2">
+							<view class="tit" :class="{ action: item._type == 2 }">
 								<text>{{ item.coupon_price }}</text>
 							</view>
 							<view class="price">
@@ -25,10 +25,11 @@
 					</view>
 					<view class="row_list_right">
 						<view class="right_top">
-							<text class="right_title" :class="{ action: item._type == 2}">{{ item.coupon_title }}</text>
+							<!-- <text class="right_name">【满减券】</text> -->
+							<text class="right_title" :class="{ action: item._type == 2 }">{{ item.coupon_title }}</text>
 						</view>
 						<view class="right_time">
-							<text>{{ item._add_time }}-{{ item.end_time }}</text>
+							<text>{{ item._add_time }}-{{ item._end_time }}</text>
 						</view>
 						<view class="right_use action" v-if="item._type == 2">
 							<text>{{ item._msg }}</text>
@@ -48,7 +49,7 @@
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { getCouponsList } from '@/api/order.js';
-export default{
+export default {
 	components: {
 		uniLoadMore,
 		empty
@@ -56,13 +57,13 @@ export default{
 	data() {
 		return {
 			tabCurrentIndex: 0,
-			navList:[
+			navList: [
 				{
 					state: 0,
 					text: '全部',
 					loadingType: 'more',
 					orderList: [],
-					page: 1,//当前页数
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
 				{
@@ -78,7 +79,7 @@ export default{
 					text: '已使用',
 					loadingType: 'more',
 					orderList: [],
-					page: 1,//当前页数
+					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
 			]
@@ -88,15 +89,15 @@ export default{
 		this.loadData();
 	},
 	methods: {
-		//返回首页
-		navTo(){
+		// 返回首页
+		navTo() {
 			uni.switchTab({
 				url: '/pages/index/index'
 			});
 		},
 		//获取订单列表
 		loadData(source) {
-			//将订单挂载到tab列表下
+			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
 			let state = navItem.state;
@@ -104,11 +105,11 @@ export default{
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading'){
+			if (navItem.loadingType === 'loading') {
 				//防止重复加载
 				return;
 			}
-			//修改当前对象状态为加载中
+			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 			getCouponsList(
 				{
@@ -121,16 +122,17 @@ export default{
 					let da = data.map(e => {
 						e.coupon_price = +e.coupon_price.replace(',', '');
 						e.use_min_price = +e.use_min_price.replace(',', '');
-						return e
+						return e;
 					});
 					navItem.orderList = navItem.orderList.concat(da);
 					console.log(navItem.orderList);
 					navItem.page++;
 					if (navItem.limit == data.length) {
-						// 判断是否还有数据，有改为more，没有改为noMore
+						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
-					}else {
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'noMore';
 					}
 					uni.hideLoading();
@@ -138,8 +140,9 @@ export default{
 				})
 				.catch(e => {
 					console.log(e);
-				})
+				});
 		},
+
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -156,44 +159,6 @@ export default{
 <style lang="scss">
 // 卡卷可用时颜色
 $card-color-action: #fc4141;
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: #bc253a;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #bc253a;
-			}
-		}
-	}
-}
 
 .swiper-box {
 	height: calc(100% - 40px);
@@ -203,7 +168,6 @@ page,
 		color: #1b1b1b;
 	}
 }
-
 .row {
 	border-radius: 15rpx;
 	margin: 0 25rpx;
@@ -266,7 +230,7 @@ page,
 			margin: 15rpx 0;
 			padding: 10rpx;
 			width: 140rpx;
-			text_align: center;
+			text-align: center;
 			border-radius: 50rpx;
 			color: #fff;
 			font-size: $font-sm - 4rpx;
@@ -293,13 +257,51 @@ page,
 			}
 		}
 	}
-	
+
 	.iconlocation {
 		font-size: 36rpx;
 		color: $font-color-light;
 	}
 }
-// uni-load-more
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: #bc253a;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #bc253a;
+			}
+		}
+	}
+}
+/* load-more */
 .uni-load-more {
 	display: flex;
 	flex-direction: row;

pages/user/favorites.vue

@@ -10,7 +10,7 @@
 					<view>
 						<text>￥{{ ls.price }}</text>
 					</view>
-					<view class="icon_del" @click.prevent.stop="del(ls.pid)" v-show="delshow">
+					<view @click.prevent.stop="del(ls.pid)" v-show="delshow" class="icon_del">
 						<text class="iconfont icondelete"></text>
 						<text>取消</text>
 					</view>
@@ -55,13 +55,6 @@ export default {
 					console.log(e);
 				});
 		},
-		//跳转商品详情页
-		toproduct(item) {
-			let id = item;
-			uni.navigateTo({
-				url: `/pages/product/product?id=${id}`
-			})
-		},
 		//删除收藏夹商品
 		del(item) {
 			let obj = this;
@@ -88,8 +81,25 @@ export default {
 				}
 			});
 		},
+		//跳转商品详情页
+		toproduct(item) {
+			let id = item;
+			uni.navigateTo({
+				url: `/pages/product/product?id=${id}`
+			});
+		}
+		// //跳转忘记密码
+		// forget() {
+		// 	uni.navigateTo({
+		// 		url: `/pages/public/forget`
+		// 	});
+		// },
+		// // 后退
+		// navBack() {
+		// 	uni.navigateBack();
+		// }
 	}
-}
+};
 </script>
 
 <style lang="scss">
@@ -118,6 +128,7 @@ page {
 .favorites {
 	width: 90%;
 	background-color: #ffffff;
+	// height:100%;
 	border-radius: 15rpx;
 	margin: 15rpx auto;
 	padding: 25rpx 25rpx;
@@ -145,7 +156,7 @@ page {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: -webkit-box;
-	-webkit-box-orient: vertial;
+	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 2;
 }
 .favorites_peice {

store/index.js

@@ -8,6 +8,7 @@ const store = new Vuex.Store({
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		baseURL:'http://base.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
+		hasLogin: false, //是否登录
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN