8-23-2

pages/user/index.vue

@@ -13,6 +13,7 @@
 					<image src="../../static/error/missing-face.png" mode="" v-else></image>
 					<view class="user-font">
 						<view class="name clamp">{{ userInfo.nickname }}</view>
+						<view class="name clamp" @click="navto('/pages/users/login/index')" v-if="!userInfo.nickname ">登录</view>
 						<view class="phone">{{ userInfo.phone }}</view>
 						<view class="phone" v-if="userInfo.uid">邀请码：{{ userInfo.uid }}</view>
 					</view>
@@ -283,6 +284,16 @@ export default {
 				this.openAuto();
 			}
 		},
+		navto(url) {
+			uni.navigateTo({
+				url,
+				fail() {
+					uni.switchTab({
+						url
+					})
+				}
+			})
+		},
 		toService(mer) {
 			uni.navigateTo({
 				url: '/pages/admin/business/index?is_sys=' + (mer ? '0' : '1')

pages/users/order_confirm/index.vue

@@ -311,11 +311,11 @@
 					<view>店铺优惠金额：</view>
 					<view class='money'>-￥{{coupon_price}}</view>
 				</view> -->
-				<!-- <view class='item acea-row row-between-wrapper'
-					v-if="open_integral && userInfo.integral>0 && order_type == 0">
+				<view class='item acea-row row-between-wrapper'
+					v-if="open_integral && order_type == 0 && is_jf == 0 && is_xfq == 0">
 					<view>积分抵扣：</view>
-					<view class='money'>
-						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
+					<view class='money' >
+						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral*1}}</text></text>
 						<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
 						<checkbox-group class="checkbox integral_checked" name="isDefault" @change="changeIntegral">
 							<label>
@@ -323,7 +323,7 @@
 							</label>
 						</checkbox-group>
 					</view>
-				</view> -->
+				</view>
 				<!-- 				<view class='item acea-row row-between-wrapper'
 					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
@@ -914,15 +914,6 @@
 					return
 				}
 				this.totalPrice = tempTotal
-				if (this.totalPrice == 0) {
-					this.cartArr = [{
-						"name": "余额支付",
-						"icon": "icon-icon-test",
-						value: 'balance',
-						title: '可用余额:',
-						payStatus: this.$store.getters.globalData.yue_pay_status,
-					}]
-				}
 			},
 			/**
 			 * 选择地址后改变事件
@@ -1029,15 +1020,6 @@
 						}
 					})
 					uni.hideLoading();
-					if (that.totalPrice == 0) {
-						that.cartArr = [{
-							"name": "余额支付",
-							"icon": "icon-icon-test",
-							value: 'balance',
-							title: '可用余额:',
-							payStatus: this.$store.getters.globalData.yue_pay_status,
-						}]
-					}
 				}).catch(err => {
 					return this.$util.Tips({
 						title: err