7-15-1

main.js

@@ -5,6 +5,7 @@ import uView from 'uview-ui'
 // #ifdef H5
 import dsbridge from '@/static/js/dsbridge.js'
 import alipay from '@/static/js/alipay.js'
+import weixin from '@/static/js/weixin.js'
 // #endif
 
 Vue.use(uView)
@@ -45,6 +46,7 @@ Vue.prototype.$api = {msg, prePage};
 // #ifdef H5
 Vue.prototype.$dsbridge = dsbridge
 Vue.prototype.$alipay = alipay
+Vue.prototype.$weixin = weixin
 // #endif
 
 App.mpType = 'app'

manifest.json

@@ -14,15 +14,19 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
@@ -54,7 +58,13 @@
                     }
                 },
                 "geolocation" : {},
-                "payment" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
                 "push" : {},
                 "share" : {},
                 "speech" : {},

pages.json

@@ -516,7 +516,7 @@
 		{
 			"path": "pages/index/bdzq",
 			"style": {
-				"navigationBarTitleText": "爆品专区",
+				"navigationBarTitleText": "积分专区",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -525,7 +525,7 @@
 		{
 			"path": "pages/index/rxbd",
 			"style": {
-				"navigationBarTitleText": "热销榜",
+				"navigationBarTitleText": "易博甄选",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -550,12 +550,12 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
+			// {
+			// 	"pagePath": "pages/category/category",
+			// 	"iconPath": "static/tabBar/tab-cate.png",
+			// 	"selectedIconPath": "static/tabBar/tab-cate-current.png",
+			// 	"text": "分类"
+			// },
 			{
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/tab-cart.png",

pages/cart/cart.vue

@@ -31,7 +31,7 @@
 						<view class="item-right">
 							<text class="clamp title">{{ item.productInfo.store_name }}</text>
 							<text class="attr">{{ item.attr_val }}</text>
-							<text class="price">¥{{ item.productInfo.price }}</text>
+							<text class="price">{{ item.integral }}积分</text>
 							<uni-number-box
 								class="step"
 								:min="1"
@@ -54,7 +54,7 @@
 					<view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view>
 				</view>
 				<view class="total-box">
-					<text class="price">¥{{ total }}</text>
+					<text class="price">{{ total }}积分</text>
 					<!-- <text class="coupon">
 						已优惠
 						<text>74.35</text>
@@ -222,7 +222,7 @@ export default {
 			let checked = true;
 			list.forEach(item => {
 				if (item.checked === true) {
-					total += item.productInfo.price * item.cart_num;
+					total += item.integral * item.cart_num;
 				} else if (checked === true) {
 					checked = false;
 				}

pages/index/bdzq.vue

@@ -7,7 +7,7 @@
 			<view class="goback-box" @click="toBack">
 				<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
 			</view>
-			<view class="header">爆品专区</view>
+			<view class="header">积分专区</view>
 		</view>
 		<view class="top-bg flex">
 			<image src="../../static/img/bd-mbg.png" mode=""></image>
@@ -16,7 +16,7 @@
 			<view class="bg-bg">
 
 			</view>
-			<view v-for="(item, index) in list" :key="item.id" class="guess-item">
+			<view v-for="(item, index) in list" :key="item.id" class="guess-item" @click.stop="navTo('/pages/product/product?id=' + item.id + '&is_xf=0&is_bk=1')">
 				<image :src="item.image"></image>
 				<view class="guess-box">
 					<view class="title clamp2">{{item.store_name}}</view>
@@ -30,7 +30,7 @@
 						</view>
 					</view>
 
-					<view class="btn" @click.stop="navTo('/pages/product/product?id=' + item.id + '&is_xf=0&is_bk=1')">
+					<view class="btn" >
 						立即购买</view>
 				</view>
 			</view>

pages/index/index.vue

@@ -23,11 +23,11 @@
 		<view class="jg"></view>
 		<!-- 分类 start-->
 		<view class="cate-section flex">
-			<view class="cate-item flex" @click="nav('/pages/index/rxbd')">
+			<view class="cate-item flex" @click="gozx">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/c1.png" mode=""></image>
 				</view>
-				<view class="item-title">热销榜</view>
+				<view class="item-title">易博甄选</view>
 			</view>
 			<view class="cate-item flex" @click="goCp()">
 				<view class="img-wrapper flex">
@@ -41,12 +41,12 @@
 				</view>
 				<view class="item-title">视频领奖</view>
 			</view>
-			<view class="cate-item flex" @click="nav('/pages/coupon/couponList')">
+			<!-- <view class="cate-item flex" @click="nav('/pages/coupon/couponList')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/c4.png" mode=""></image>
 				</view>
 				<view class="item-title">领券中心</view>
-			</view>
+			</view> -->
 			<view class="cate-item flex" @click="nav('/pages/user/shareQrCode')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/c5.png" mode=""></image>
@@ -70,7 +70,7 @@
 			</view>
 			<view class="zq-item bd" @click="nav('/pages/index/bdzq')">
 				<view class="zq-tit">
-					爆品专区
+					积分专区
 				</view>
 				<view class="item-info flex">
 					<image src="../../static/img/bd-bg.png" mode=""></image>
@@ -96,18 +96,21 @@
 			</view>
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in list" :key="item.id"
-					@click="nav('/pages/product/product?id=' + item.id)">
+					@click="nav('/pages/product/product?id=' + item.id)" style="height: 520rpx;">
 					<view class="image-wrapper">
 						<image class="image" :src="item.image" mode="scaleToFill"></image>
 					</view>
-					<view class="title clamp2">{{item.store_name}}</view>
-					<view class="hot-price">
-						<view class="price">
-							<text class="font-size-sm">￥</text>
-							{{ item.price * 1 }}
+					<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 160rpx;">
+						<view class="title clamp2">{{item.store_name}}</view>
+						<view class="hot-price">
+							<view class="price">
+								<text class="font-size-sm"></text>
+								{{ item.integral * 1 }}<text class="jf">积分</text>
+							</view>
+							<view class="yuanPrice">市场价：￥{{ item.ot_price*1 }}</view>
 						</view>
-						<view class="yuanPrice">{{ item.ot_price*1 }}</view>
 					</view>
+					
 				</view>
 			</view>
 			<uni-load-more :status="loadingType"></uni-load-more>
@@ -166,6 +169,7 @@
 		},
 		methods: {
 			openGg() {
+				console.log(this.$dsbridge,'this.$dsbridge')
 				this.$dsbridge.call("fnAds.onShowRewardVideoAD", {}, function(result) {
 					// alert(result);
 					// 奖励状态返回
@@ -176,6 +180,7 @@
 						advertisement({
 							task:'1'
 						}).then(e => {
+							// alert('已观看')
 							// alert('奖励已发放')
 							// uni.showToast({
 							// 	title:'奖励已发放',
@@ -187,7 +192,10 @@
 				});
 			},
 			goCp() {
-				
+				window.location.href='http://web.mall.hqgjsmc.com/'
+			},
+			gozx() {
+				window.location.href='https://chen.ningjuwang.com/shop/wap/27x50ex0ep39-qfKx#/index?preview_template_id=19&preview_page_id=190&preview_template_type=1'
 			},
 			swiperChange() {
 
@@ -257,7 +265,7 @@
 	.top-search {
 		height: 80rpx;
 		// padding: 0 20rpx;
-		background-color: #f32b09;
+		background-color: #338fc0;
 		justify-content: center;
 
 		.search-box {
@@ -286,7 +294,7 @@
 	// 顶部轮播图
 	.swiper-wrap {
 		width: 750rpx;
-		background-color: #f32b09;
+		background-color: #338fc0;
 
 		.top-swiper {
 			width: 700rpx;
@@ -326,13 +334,13 @@
 
 	.jg {
 		height: 20rpx;
-		background-color: #f32b09;
+		background-color:#338fc0;
 	}
 
 	.status_bar {
 		height: var(--status-bar-height);
 		width: 100%;
-		background: #f32b09;
+		background:#338fc0;
 	}
 
 	// 分类
@@ -340,7 +348,7 @@
 		justify-content: space-around;
 		background-color: #fff;
 		padding: 0rpx 0 30rpx;
-		background: #f32b09;
+		background: #338fc0;
 
 		.cate-item {
 			flex-grow: 0;
@@ -379,7 +387,7 @@
 	.zq-wrap {
 		height: 345rpx;
 		width: 750rpx;
-		background: linear-gradient(180deg, #f32b09, #fff);
+		background: linear-gradient(180deg, #338fc0, #fff);
 
 		padding: 0 27rpx;
 
@@ -472,7 +480,8 @@
 			width: 345rpx;
 			background-color: #ffffff;
 			border-radius: 12rpx;
-
+			box-shadow:0 0 15rpx rgba(0, 0, 0,0.2);
+			margin-bottom: 15rpx;
 			.image-wrapper {
 				width: 345rpx;
 				height: 345rpx;
@@ -503,6 +512,7 @@
 
 			.title {
 				margin-top: 24rpx;
+				padding: 0 20rpx;
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -513,7 +523,7 @@
 				display: flex;
 				justify-content: flex-start;
 				align-items: center;
-				padding: 14rpx 0 30rpx;
+				// padding: 14rpx 0 30rpx;
 
 				.hotPrice-box {
 					padding: 2rpx 6rpx;
@@ -533,6 +543,9 @@
 					font-size: 40rpx;
 					color: #ff0000;
 					font-weight: 500;
+					.jf {
+						font-size: 20rpx;
+					}
 				}
 
 				.yuanPrice {

pages/index/xfqzq.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="bastgood-box">
 			<view class="bg-bg"></view>
-			<view v-for="(item, index) in list" :key="item.id" class="guess-item">
+			<view v-for="(item, index) in list" :key="item.id" class="guess-item" @click.stop="navTo('/pages/product/product?id='+ item.id + '&is_xf=1&is_bk=0')">
 				<image :src="item.image"></image>
 				<view class="guess-box">
 					<view class="title clamp2">{{item.store_name}}</view>
@@ -28,7 +28,7 @@
 						</view>
 					</view>
 
-					<view class="btn" @click.stop="navTo('/pages/product/product?id='+ item.id + '&is_xf=1&is_bk=0')">
+					<view class="btn" >
 						立即购买</view>
 				</view>
 			</view>

pages/money/pay.vue

@@ -28,7 +28,7 @@
 			<view class="type-item" @click="changePayType(3)">
 				<text class="icon iconfont iconyue"></text>
 				<view class="con">
-					<text class="tit">消费积分支付</text>
+					<text class="tit">余额支付</text>
 					<text>可用余额 ¥{{ now_money }}</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
@@ -99,7 +99,7 @@ export default {
 		changePayType(type) {
 			this.payType = type;
 			if (this.payType == 1) {
-				this.payName = 'weixin';
+				this.payName = 'weixin_s';
 			}
 			if (this.payType == 2) {
 				this.payName = 'alipay';
@@ -114,7 +114,7 @@ export default {
 			orderPay({
 				uni: obj.orderId,
 				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
+				from: obj.froms ? 'weixin_s' : 'H5', //来源
 				// #endif
 				// #ifdef MP-WEIXIN
 				from: 'routine', //来源
@@ -133,8 +133,10 @@ export default {
 							obj.$api.msg(msg);
 						}
 					}
-					if (obj.payName == 'weixin' || obj.payName == 'routine') {
-						let da = e.data.result.jsConfig;
+					if (obj.payName == 'weixin_s' || obj.payName == 'routine') {
+						let da = e.data.result.jsConfig;
+						console.log(da,'da++++++++++++++++++++++++++++')
+						console.log(da,'da+++++++++++++')
 						let data = {
 							// #ifdef H5
 							timestamp: da.timestamp,
@@ -156,8 +158,11 @@ export default {
 							}
 						};
 						// #ifdef H5
-						if(obj.payName == 'weixin'){
-						obj.weichatObj.chooseWXPay(data);
+						if(obj.payName == 'weixin_s'){
+							console.log(data,'data+++++++++++++++')
+						// obj.weichatObj.chooseWXPay(data);
+						console.log(obj.$weixin,'ddddddddddddd')
+						obj.$weixin.chooseWXPay(data)
 						}
 						// #endif
 						// #ifdef MP-WEIXIN
@@ -199,7 +204,8 @@ export default {
 				mask: true
 			})
 			// 判断是否余额不足
-			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
+			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
+				uni.hideLoading()
 				uni.showModal({
 					title: '提示',
 					content: '账户余额不足！',
@@ -242,7 +248,7 @@ export default {
 				payType: obj.payName,
 				mark: prepage.desc, //备注
 				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
+				from: obj.froms ? 'weixin_s' : 'H5', //来源
 				// #endif
 				// #ifdef MP-WEIXIN
 				from: 'routine', //来源
@@ -288,8 +294,10 @@ export default {
 					}
 				})
 				.catch(e => {
-					uni.hideLoading();
-					obj.payLoding = false;
+					uni.hideLoading();
+					
+					obj.payLoding = false;
+					// obj.firstCreateOrder();
 					console.log(e);
 				});
 		}

pages/order/createOrder.vue

@@ -73,14 +73,14 @@
 
 		<!-- 优惠明细 -->
 		<view class="yt-list">
-			<view class="yt-list-cell b-b" @click="couponListshow ? toggleMask('show') : ''">
+			<!-- <view class="yt-list-cell b-b" @click="couponListshow ? toggleMask('show') : ''">
 				<view class="cell-icon">券</view>
 				<text class="cell-tit clamp">优惠券</text>
 				<text class="cell-tip active" v-if="couponListshow && !couponChecked.coupon_price">选择优惠券</text>
 				<text class="cell-tip red" v-if="couponChecked.coupon_price">-￥{{ couponChecked.coupon_price }}</text>
 				<text class="cell-tip disabled" v-if="!couponListshow && !couponChecked.coupon_price">没有优惠券</text>
 				<text class="cell-more wanjia wanjia-gengduo-d"></text>
-			</view>
+			</view> -->
 			<!-- <view class="yt-list-cell b-b" v-if="moneyAll.storeFreePostage > 0">
 				<view class="cell-icon hb">减</view>
 				<text class="cell-tit clamp">商家促销</text>
@@ -93,10 +93,10 @@
 				<text class="cell-tit clamp">优惠金额</text>
 				<text class="cell-tip red">-￥35</text>
 			</view> -->
-			<view class="yt-list-cell b-b" v-if="is_bk == 0 && is_xf == 0">
+			<!-- <view class="yt-list-cell b-b" v-if="is_bk == 0 && is_xf == 0">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
-			</view>
+			</view> -->
 			<view class="yt-list-cell b-b" v-if="is_bk == 0 && is_xf == 1">
 				<text class="cell-tit clamp">消费券抵扣{{ '（当前消费券：' + consumptionAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedconsumption = !checkedconsumption" color=" #5dbc7c" :checked="checkedconsumption" /></view>
@@ -229,7 +229,9 @@ export default {
 			consumptionAll: 0,
 		};
 	},
-	onLoad(option) {
+	onLoad(option) {
+		this.checkedconsumption = false
+		this.checkedPoints = false
 		// 判断是否为拼团商品
 		if (option.type == 'pink') {
 			this.pinkid = option.pinkId;
@@ -239,11 +241,16 @@ export default {
 			this.cartId = option.id;
 			this.loadData();
 		}
-		if(option.is_bk) {
+		if(option.is_bk == 1) {
 			this.is_bk = option.is_bk
 		}
-		if(option.is_xf) {
+		if(option.is_xf==1) {
 			this.is_xf = option.is_xf
+			console.log('is_xf++++++++++++++',this.is_xf)
+			this.checkedconsumption = true
+		}
+		if(this.is_xf == 0 && this.is_bk == 0 ) {
+			this.checkedPoints = true
 		}
 		this.userinfo();
 	},

pages/order/order.vue

@@ -59,7 +59,7 @@
 							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
 							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
+							<!-- <button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button> -->
 						</view>
 					</view>
 

pages/product/product.vue

@@ -33,11 +33,16 @@
 
 		<view class="introduce-section">
 			<text class="title" v-if="goodsType == 1">{{ goodsObjact.title }}</text>
-			<view class="price-box" v-if="goodsType == 0">
+			<view class="price-box" v-if="goodsType == 0 && (is_bk != 0 || is_xf != 0)">
 				<text class="price-tip">¥</text>
 				<text class="price">{{ goodsObjact.price }}</text>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
-				<!-- <text class="coupon-tip">7折</text> -->
+			</view>
+			<view class="price-box" v-if="goodsType == 0 && is_bk == 0 && is_xf == 0">
+				<!-- <text class="price-tip">¥</text> -->
+				<text class="price">{{ goodIntegral }}</text>
+				<text class="price-tip">积分</text>
+				<text class="m-price ">市场价：¥{{ goodsObjact.ot_price }}</text>
 			</view>
 			<text class="title" v-if="goodsType == 0">{{ goodsObjact.store_name }}</text>
 		</view>
@@ -93,7 +98,6 @@
 				<text class="iconfont " :class="{ iconlike: !goodsObjact.userCollect, iconlikefill: goodsObjact.userCollect }"></text>
 				<text>收藏</text>
 			</view> -->
-
 			<view class="action-btn-group">
 				<view class="shoucang flex" @click="toFavorite(goodsObjact)">
 					<image src="../../static/icon/sc-ico.png" mode=""></image>
@@ -136,7 +140,9 @@
 					<image :src="actionImage"></image>
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price">¥{{ actionPrice }}</text>
+						<text class="price" v-if="is_bk != 0 || is_xf != 0">¥{{ actionPrice }}</text>
+						<text class="price" v-if="is_bk == 0 && is_xf == 0">{{ goodIntegral }}积分</text>
+						<!-- <text class="price jf">{{ goodIntegral }}</text> -->
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：
@@ -167,7 +173,7 @@
 				<button class="btn" @click.stop="buy">确定</button>
 			</view>
 		</view>
-		<view :class="{ seckillBottom: goodsType == 1, goodsBottom: goodsType == 0 }"></view>
+		<!-- <view :class="{ seckillBottom: goodsType == 1, goodsBottom: goodsType == 0 }"></view> -->
 		<!-- 分享 -->
 		<!-- <share ref="share" :contentHeight="580" :shareList="shareList"></share> -->
 	</view>
@@ -249,7 +255,8 @@ export default {
 				s: '' //秒
 			},
 			is_bk: 0,
-			is_xf: 0
+			is_xf: 0,
+			goodIntegral: 0,//需要使用的积分
 		};
 	},
 	async onLoad(options) {
@@ -339,7 +346,8 @@ export default {
 				obj.actionPrice = goods.price; //保存默认选中商品价格
 				obj.actionImage = goods.image_base; //保存默认选中商品价格
 				obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
+				obj.shopId = data.mer_id; //保存商店id
+			
 				// 保存默认选中的对象
 				obj.specSelected = []; //初始化默认选择对象
 				for (let i = 0; i < obj.specList.length; i++) {
@@ -353,7 +361,9 @@ export default {
 				let str = obj.specSelected.join(',');
 				// 设置默认值
 				obj.actionImage = obj.productValue[str].image;
-				obj.uniqueId = obj.productValue[str].unique;
+				obj.uniqueId = obj.productValue[str].unique;
+				obj.goodIntegral = obj.productValue[str].integral
+				console.log(obj.goodIntegral,'obj.goodIntegral')
 				// #ifdef H5
 				obj.shareDate();
 				// #endif
@@ -414,7 +424,9 @@ export default {
 				this.actionPrice = data.price;
 				this.goodsNumberMax = data.stock;
 				this.actionImage = data.image;
-				this.uniqueId = data.unique;
+				this.uniqueId = data.unique;
+				this.goodIntegral = data.integral
+				console.log(this.goodIntegral,'xuanz')
 			}
 		},
 		//分享
@@ -518,7 +530,7 @@ page {
 }
 //默认商品底部高度
 .goodsBottom {
-	height: 160rpx;
+	height: 100rpx;
 }
 .iconenter {
 	font-size: $font-base + 2rpx;
@@ -634,6 +646,9 @@ page {
 		margin: 0 12rpx;
 		color: $font-color-light;
 		text-decoration: line-through;
+	}
+	.pt {
+		text-decoration:none;
 	}
 	.coupon-tip {
 		align-items: center;
@@ -1163,5 +1178,10 @@ page {
 		font-size: $font-lg;
 		line-height: 1;
 	}
+}
+.detail-centent {
+	img {
+		vertical-align: top;
+	}
 }
 </style>

pages/public/login.vue

@@ -9,14 +9,14 @@
 				<view class="login_img">
 					<image src="/static/icon/img03.png"></image>
 				</view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" />
+				<view class="login_name"><input class="uni-input" v-model="username" 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="passward" focus
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward"
 						placeholder="请输入密码" /></view>
 			</view>
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
@@ -25,13 +25,18 @@
 			<navigator url="../set/password">
 				<view class="forget">忘记密码</view>
 			</navigator>
+			<label class="two" @click="checkbixJz">
+				<radio style="transform:scale(0.7)" color="#5dbc7c" :checked="isJz" />
+				记住密码<br/>
+			</label>
 			<label class="two" @click="checkboxChange">
 				<radio style="transform:scale(0.7)" color="#5dbc7c" :checked="istype" />
 				我已阅读并同意
 				<text @click.stop="navTo('/pages/contract/agreement')">《用户协议》</text>
-				&nbsp
-				<text @click.stop="navTo('/pages/contract/privacy')">《隐私政策》</text>
+				&nbsp<br />
+				<text @click.stop="navTo('/pages/contract/privacy')" style="margin-left: 40rpx;display: inline-block;">《隐私政策》</text>
 			</label>
+			
 			<!-- <view class="flex other">
 				<view class="fenge"></view>
 				<view class="qita">其他方式登录</view>
@@ -89,6 +94,7 @@
 	export default {
 		data() {
 			return {
+				isJz: true,//是否记住密码
 				istype: false,
 				username: '',
 				passward: '',
@@ -115,12 +121,19 @@
 			})
 			// #endif
 		},
+		onShow() {
+			this.username = uni.getStorageSync('username') || ''
+			this.passward = uni.getStorageSync('passward') || ''
+		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'login']),
 			checkboxChange() {
 				this.istype = !this.istype;
 				console.log(this.istype);
 			},
+			checkbixJz() {
+				this.isJz = !this.isJz
+			},
 			navTo(url) {
 				uni.navigateTo({
 					url
@@ -239,6 +252,10 @@
 					.then(function(e) {
 						console.log(e.data.token, "123456");
 						uni.setStorageSync('token', e.data.token);
+						if(obj.isJz) {
+							uni.setStorageSync('username',obj.username)
+							uni.setStorageSync('passward',obj.passward)
+						}
 						// obj.$store.commit('hasLogin', true);
 						uni.setTabBarItem({
 							index: 0,
@@ -419,10 +436,11 @@
 		}
 
 		.forget {
-			font-size: 28rpx;
+			font-size: 30rpx;
+			font-weight: bold;
 			width: 100%;
 			text-align: right;
-			color: #999999;
+			color: #888;
 		}
 
 		.uni-button-green {

pages/public/register.vue

@@ -25,13 +25,13 @@
 				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus
 						placeholder="请重复输入密码" /></view>
 			</view>
-			<view class="login_input flex">
+			<!-- <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="payment_pas" focus
 						placeholder="请输入支付密码" /></view>
-			</view>
+			</view> -->
 			<view class="login_input flex">
 				<view class="login_img">
 					<image src="/static/icon/img07.png"></image>
@@ -120,10 +120,10 @@
 					obj.$api.msg('两次密码不正确');
 					return;
 				}
-				if (obj.payment_pas == '') {
-					obj.$api.msg('请输入支付密码');
-					return;
-				}
+				// if (obj.payment_pas == '') {
+				// 	obj.$api.msg('请输入支付密码');
+				// 	return;
+				// }
 				if (obj.invitation == '') {
 					obj.$api.msg('请输入邀请码');
 					return;
@@ -141,7 +141,7 @@
 					captcha: obj.code, //验证码
 					password: obj.password, //密码
 					spread: obj.invitation, //上级推广人
-					payment_pas: obj.payment_pas
+					// payment_pas: obj.payment_pas
 					// pas: obj.payment_pas
 				}).then(function(e) {
 					uni.showToast({

pages/user/mytg.vue

@@ -8,8 +8,14 @@
 			</view>
 			<view class="content-bg"><image src="../../static/img/zhihuanjuan.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.aid_val || '0' }}</view>
-				<view>我的推广人数</view>
+				<view class="" style="width: 50%;">
+					<view class="money">{{ total || '0' }}</view>
+					<view>我的推广人数</view>
+				</view>
+				<view class="" style="width: 50%;">
+					<view class="money">{{ order_count || '0' }}</view>
+					<view>团队业绩</view>
+				</view>
 			</view>
 		</view>
 		<view class="navbar">
@@ -31,11 +37,11 @@
 							</view>
 							<view class="list_tpl">
 								<view class="title">
-									<text>{{ item.nickname }}</text>
+									<text>{{ item.phone || '' }}</text>
 								</view>
 								<view class="time">
-									<text>{{item.phone || ''}}</text><text
-										style="margin-left: 40rpx;">{{ item.time }}</text>
+									<!-- <text>{{item.phone || ''}}</text> -->
+									<text>业绩：{{ item.numberCount || '0' }}</text>
 								</view>
 							</view>
 						</view>
@@ -95,7 +101,7 @@
 					},
 					{
 						state: 1,
-						text: '二级推广',
+						text: '我的团队',
 						loadingType: 'more',
 						orderList: [],
 						page: 1, //当前页数
@@ -107,7 +113,8 @@
 				total: '',
 				totalLevel: '',
 				img: 'http://kaifa.crmeb.net/uploads/attach/2019/08/20190807/723adbdd4e49a0f9394dfc700ab5dba3.png',
-				userInfo: {}
+				userInfo: {},
+				order_count: '',
 			};
 		},
 		onLoad(options) {},
@@ -156,7 +163,7 @@
 						data
 					}) => {
 						console.log(data);
-
+						this.order_count = data.order_count
 						this.total = data.total;
 						this.totalLevel = data.totalLevel;
 						// this.all = this.total + this.totalLevel;
@@ -284,7 +291,8 @@
 		flex-direction: column;
 		justify-content: center;
 		/* #endif */
-		
+		display: flex;
+		justify-content: center;
 		.money {
 			font-size: 72rpx;
 			font-family: PingFang SC;

pages/user/user.vue

@@ -121,9 +121,9 @@
 							<view class="tool-img"><image src="../../static/icon/gn3.png" mode=""></image></view>
 							<view class="tool-name">我的收藏</view>
 						</view>
-						<view class="tool-item" @click="navTo('/pages/coupon/myCoupon')()">
-							<view class="tool-img"><image src="../../static/icon/gn4.png" mode=""></image></view>
-							<view class="tool-name">我的优惠券</view>
+						<view class="tool-item" @click="navTo('/pages/set/password')">
+							<view class="tool-img"><image src="../../static/icon/i8.png" mode=""></image></view>
+							<view class="tool-name">修改密码</view>
 						</view>
 						<view class="tool-item" @click="openKf()">
 							<view class="tool-img"><image src="../../static/icon/gn5.png" mode=""></image></view>

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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ead01763.js></script><script src=/index/static/js/index.1ad2d78e.js></script></body></html>
+            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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ead01763.js></script><script src=/index/static/js/index.917460ba.js></script></body></html>

utils/loginUtils.js

@@ -10,10 +10,10 @@ export function interceptor() {
 	let url = '/pages/public/login'
 	// #ifdef H5
 	// 判断是否为公众号调用微信授权登录
-	let weichatBrowser = uni.getStorageSync('weichatBrowser');
-	if (weichatBrowser) {
-		url = '/pages/public/wxLogin';
-	}
+	// let weichatBrowser = uni.getStorageSync('weichatBrowser');
+	// if (weichatBrowser) {
+	// 	url = '/pages/public/wxLogin';
+	// }
 	// #endif
 	// #ifdef MP-WEIXIN
 	url = '/pages/public/wxLogin';