更新

pages/newActivity/giftBag/giftBag.vue

@@ -27,11 +27,11 @@
                 <view class="bottom">
                   <view class="bottom_item">
                     <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
-                    <view class="text">8%无门槛红包</view>
+                    <view class="text">{{tipType[red_type].red1}}</view>
                   </view>
                   <view class="bottom_item">
                     <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
-                    <view class="text">42%现金抵扣红包</view>
+                    <view class="text">{{tipType[red_type].red2}}</view>
                   </view>
                 </view>
               </view>
@@ -49,6 +49,29 @@
       </view>
       <view class="primary_btn" @click="$u.throttle(submitSub, 1500)">立即购买</view>
     </view>
+    <uni-popup ref="redTipsRef">
+      <view class="ref_ref">
+        <view class="ref_top">
+          购买礼包金额达到
+          <text v-if="red_type==0">100-2000</text>
+          <text v-if="red_type==1">2001-4000</text>
+          <text v-if="red_type==2">4001-20000</text>
+        </view>
+        <view class="ref_center">
+          赠送红包变为
+        </view>
+        <view class="ref_bottom">
+          <view class="bottom_item">
+            <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
+            <view class="text">{{tipType[red_type].red1}}</view>
+          </view>
+          <view class="bottom_item">
+            <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
+            <view class="text">{{tipType[red_type].red2}}</view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
     <payment :payMode="payMode" :order_id="rechar_id" :pay_close="pay_close" :is-call="true" @onChangeFun="onChangeFun"
       :totalPrice="totalPrice"></payment>
     <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
@@ -110,6 +133,21 @@
         isAuto: false, //没有授权的不会自动授权
         isShowAuth: false, //是否隐藏授权
         recordList: [],
+        tipType: [
+          {
+            red1: '8%无门槛红包',
+            red2: '42%现金抵扣红包'
+          },
+          {
+            red1: '12%无门槛红包',
+            red2: '68%现金抵扣红包'
+          },
+          {
+            red1: '15%无门槛红包',
+            red2: '85%现金抵扣红包'
+          },
+        ],
+        red_type: 0,
         where: {
           page: 1,
           limit: 15,
@@ -155,7 +193,11 @@
         this.isShowAuth = true
       }
     },
-    onShow() {},
+    onShow() {
+      this.$nextTick(()=>{
+          this.$refs.redTipsRef.open();
+      })
+    },
     computed: {
       ...mapGetters(['isLogin', 'viewColor', 'keyColor']),
       total() {
@@ -188,11 +230,25 @@
         }
       },
       append(item) {
+        if(this.total + item.count >=2001 &&  this.total + item.count <=4000 && this.red_type != 1){
+          this.red_type = 1;
+          this.$refs.redTipsRef.open();
+        }else if(this.total + item.count >=4001 &&  this.total + item.count <=20000 && this.red_type != 2){
+          this.red_type = 2;
+          this.$refs.redTipsRef.open();
+        }
         if (this.total + item.count > 20000 || this.total>=20000) {
           return Toast('不可超过2万元');
         } else item.num++;
       },
       reduce(item) {
+        if(this.total - item.count >=100 &&  this.total - item.count <=2000 && this.red_type != 0){
+          this.red_type = 0;
+          this.$refs.redTipsRef.open();
+        }else if(this.total - item.count >=2001 &&  this.total - item.count <=4000 && this.red_type != 1){
+          this.red_type = 1;
+          this.$refs.redTipsRef.open();
+        }
         if (this.total==0||item.num==0) return Toast('不能再少啦');
         else item.num--;
       },
@@ -811,4 +867,34 @@
       }
     }
   }
+  .ref_ref{
+    width: 620rpx;
+    height: 200rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding: 20rpx 10rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    .ref_bottom{
+      font-size: 28rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      color: #FF3A32;
+      .bottom_item{
+        width: 280rpx;
+        display: flex;
+        align-items: center;
+        image{
+          width: 32rpx;
+          height: 40rpx;
+        }
+        .text{
+          padding-left: 15rpx;
+        }
+      }
+    }
+  }
 </style>

pages/users/login/login_copy.vue

@@ -32,7 +32,8 @@
 							</div>
 						</form>
 						<div class="tip">
-							<span @click="formItem = 2" class="font-color-red">立即注册</span>
+							<!-- <span @click="formItem = 2" class="font-color-red">立即注册</span> -->
+              <span> </span>
 							<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
 								忘记密码
 							</navigator>
@@ -656,6 +657,12 @@
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
             
+            if(data.is_new_user){
+              return uni.navigateTo({
+                url: '/pages/helpPeople/helpPeople'
+              })
+            }
+            
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -818,6 +825,12 @@
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
+            if(data.is_new_user){
+              return uni.navigateTo({
+                url: '/pages/helpPeople/helpPeople'
+              })
+            }
+            
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -828,6 +841,7 @@
 						} else {
 							method = 'navigateTo'
 						}
+            
 						if (this.getPath(backUrl) === '/pages/users/login/index') {
 							uni.switchTab({
 								url: '/pages/index/index'