流转中心

app.json

@@ -24,8 +24,8 @@
     "pages/news-detail/news-detail",
     "pages/invite/invite",
     "pages/orderFlow/orderFlow",
-    "pages/orderWithdrawal/orderWithdrawal",
     "pages/distribution/index",
+    "pages/orderWithdrawal/orderWithdrawal",
     "pages/userAccount/comDetails/index",
     "pages/userAccount/distributionOrder/index",
     "pages/userAccount/myTeam/index",

pages/buyAgain/buyAgain.wxml

@@ -84,11 +84,14 @@
           <text class='arrow'></text>
         </view> -->
         <view class='item'>
+          <text style="white-space: nowrap;">首发：</text>
+         <text style="font-size: 20rpx;">中国北斗芯片与北斗天汇应用平台首发北斗拐途联名手表，共同见证2020年12年12日拐途开机发布会＆启动新品配发仪式！</text>
+        </view>
+        <view class='item'>
           <text>买家留言：</text>
           <input placeholder='给卖家留言'></input>
         </view>
       </view>
-
     </view>
 
     <view class='order-msg'>

pages/distribution/index.wxml

@@ -67,7 +67,7 @@
         <text>点击推广</text>
       </view>
     </view>
-    <view class="menu-li" bindtap="goPage" data-page="/pages/userAccount/balanceWithdraw/index">
+    <view class="menu-li" bindtap="goPage" data-page="/pages/userAccount/balanceWithdraw/index?balance={{pageInfo.userAccount}}">
       <image src="../../images/icon/cash.png"></image>
       <view>
         <text>我要提现</text>

pages/index/index.js

@@ -26,27 +26,8 @@ Page({
     })
   },
   onLoad: function (options) {
-    let token = wx.getStorageSync('token')
-    let shareCode =  wx.getStorageSync('shareCode')
     this.getAllData();
-     // 登录返回
-     shareCode && token && this.boundParentByShareCode(app.globalData.shareCode);
-    // 如果是点击转发跳转进来，分析参数page
-    if (options.shareCode) {
-      app.globalData.shareCode = options.shareCode
-      wx.setStorageSync('shareCode', options.shareCode)
-      token && this.boundParentByShareCode(options.shareCode); // 绑定内容获取
-    }
-    console.log('邀请码',shareCode)
-   
-    // 扫码页面渲染完成
-    if (options.scene) {
-      let scene = decodeURIComponent(options.scene);
-      app.globalData.shareCode = scene.split("=")[1];
-      wx.setStorageSync('shareCode', scene.split("=")[1])
-      token && this.boundParentByShareCode(app.globalData.shareCode)
-    }
-
+ 
   },
   getVideoShow() {
     var params = {
@@ -150,7 +131,26 @@ Page({
   },
 
   onShow: function () {
-    console.log('页面参数路径', this.options)
+    let token = wx.getStorageSync('token')
+    let shareCode =  wx.getStorageSync('shareCode')
+    console.log('页面参数路径', shareCode,token)
+     // 登录返回
+     shareCode && token && this.boundParentByShareCode(shareCode);
+    // 如果是点击转发跳转进来，分析参数page
+    if (this.options.shareCode) {
+      app.globalData.shareCode = this.options.shareCode
+      wx.setStorageSync('shareCode', this.options.shareCode)
+      token && this.boundParentByShareCode(this.options.shareCode); // 绑定内容获取
+    }
+    console.log('邀请码',shareCode)
+   
+    // 扫码页面渲染完成
+    if (this.options.scene) {
+      let scene = decodeURIComponent(this.options.scene);
+      app.globalData.shareCode = scene.split("=")[1];
+      wx.setStorageSync('shareCode', scene.split("=")[1])
+      token && this.boundParentByShareCode(app.globalData.shareCode)
+    }
 
   },
 

pages/index/index.wxml

@@ -53,7 +53,7 @@
     </view>
 
     <!-- 消息播放 -->
-    <view class='message-play' bindtap='onNewsPage'>
+    <!-- <view class='message-play' bindtap='onNewsPage'>
       <image src='../../images/icon/horn.png' class='hornpng'></image>
       <swiper vertical='true' autoplay='true' duration='1000' class='swiper-cont'>
         <block wx:for='{{news}}' wx:key='index'>
@@ -61,7 +61,7 @@
         </block>
       </swiper>
       <text class='arrow'></text>
-    </view>
+    </view> -->
 
   </view>
 

pages/invite/invite.wxml

@@ -3,6 +3,6 @@
   <canvas style="width: {{canvasWidth}}px; height: {{canvasHeight}}px;" canvas-id="firstCanvas"></canvas>
   <view class="bomBtn">
     <button class='btn' bindtap='save'>保存图片</button>
-    <button class='btn' open-type="share">邀请好友</button>
+    <!-- <button class='btn' open-type="share">邀请好友</button> -->
   </view>
 </view>
\ No newline at end of file

pages/invite/invite.wxss

@@ -20,7 +20,8 @@ canvas{
   flex-direction: row;
 }
 .bomBtn .btn{
-  width: 50%;
+  /* width: 50%; */
+  width: 100%;
   font-size: 28rpx;
   color: #fff;
   background: #FC9F48;

pages/login/login.js

@@ -59,6 +59,11 @@ Page({
       }
     })
   },
+  goBack(){
+    wx.navigateBack({
+      delta: 0,
+    })
+  },
   // 用户信息
   getUserInfo() {
     var params = {

pages/login/login.wxml

@@ -2,4 +2,5 @@
 <image src='/images/icon/logo.jpg' class='c-logo'></image>
 <view class="title">中厦全供</view>
 <view class="msg">申请获得你的公开信息（昵称、头像等）</view>
-<button color="#eb2444"  open-type="getUserInfo" lang = "zh_CN" bindgetuserinfo = "onGotUserInfo" class=''>微信授权</button>
+<button color="#eb2444"  open-type="getUserInfo" lang = "zh_CN" bindgetuserinfo = "onGotUserInfo" class='login-btn'>微信授权</button>
+<view   bindtap="goBack" class="no-login">暂不登录</view>
\ No newline at end of file

pages/login/login.wxss

@@ -38,7 +38,15 @@ button {
 }
 
 
-.button-hover{
+.login-btn{
   background-color: #fff;
   color: #eb2444;
+}
+.no-login{
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+  font-size: 28rpx;
+  color: #999;
+  margin-top: 10rpx;
 }
\ No newline at end of file

pages/order-detail/order-detail.wxml

@@ -19,7 +19,7 @@
       <view class="order-num">
         <view class='order-state'>
           <text
-            class="order-sts  gray">{{status==1?'待付款':(status==2?'待发货':(status==3?'待收货':(status==4?'待评价':(status==5?'成功':(status==6?'失败':(status==7?'收益中':(status==8?'挂单中':(status==9?'退单中':(status==10?'完成':(status==-1?'已取消':(status==11?'挂单待付款':'')))))))))))}}</text>
+            class="order-sts  gray">{{status==1?'待付款':(status==2?'待发货':(status==3?'待收货':(status==4?'待评价':(status==5?'成功':(status==6?'失败':(status==7?'收益中':(status==8?'挂单中':(status==9?'已退单':(status==10?'完成':(status==-1?'已取消':(status==11?'挂单待付款':'')))))))))))}}</text>
         </view>
       </view>
       <block wx:for="{{orderItemDtos}}" wx:key=''>
@@ -124,8 +124,8 @@
           <view class='item-tit'>订单总额：</view>
           <view class='item-txt price'>
             <text class='symbol'>￥</text>
-            <text class='big-num'>{{wxs.parsePrice(productTotalAmount)[0]}}</text>
-            <text class='small-num'>.{{wxs.parsePrice(productTotalAmount)[1]}}</text>
+            <text class='big-num'>{{wxs.parsePrice(actualTotal)[0]}}</text>
+            <text class='small-num'>.{{wxs.parsePrice(actualTotal)[1]}}</text>
           </view>
         </view>
         <view class='item'>

pages/orderFlow/orderFlow.wxml

@@ -21,9 +21,9 @@
         <view class="order-num">
           <text>订单编号：{{item.orderNumber}}</text>
           <view class='order-state'>
-            <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 11挂单待付款 -->
+            <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9已退单 10完成 11挂单待付款 -->
             <text
-              class="order-sts  {{item.status==1?'red':''}}  {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'退单中':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
+              class="order-sts  {{item.status==1?'red':''}}  {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'已退单':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
             <view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}">
               <image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList'
                 data-ordernum="{{item.orderNumber}}"></image>
@@ -91,7 +91,7 @@
             <text wx:if="{{item.status==11}}" class="button warn" bindtap="onPayAgain"
               data-ordernum="{{item.orderNumber}}" hover-class='none'>付款</text>
             <text class="button warn" bindtap="buyAgain" data-ordernum="{{item.orderNumber}}" hover-class='none'
-              wx:if="{{item.status==8}}">再次购买</text>
+              wx:if="{{item.status==8}}">购买订单</text>
           </view>
         </view>
       </view>

pages/orderList/orderList.wxml

@@ -2,13 +2,20 @@
 
 <view class='container'>
   <!-- 头部菜单 -->
+
   <view class='order-tit'>
-    <text bindtap='onStsTap' data-sts="0" class="{{sts==0?'on':''}}">全部</text>
-    <text bindtap='onStsTap' data-sts="1" class="{{sts==1?'on':''}}">待支付</text>
-    <text bindtap='onStsTap' data-sts="7" class="{{sts==7?'on':''}}">收益中</text>
-    <text bindtap='onStsTap' data-sts="2" class="{{sts==2?'on':''}}">待发货</text>
-    <text bindtap='onStsTap' data-sts="3" class="{{sts==3?'on':''}}">待收货</text>
-    <text bindtap='onStsTap' data-sts="5" class="{{sts==5?'on':''}}">已完成</text>
+    <scroll-view scroll-x>
+      <view class="flex">
+        <view bindtap='onStsTap' data-sts="0" class="{{sts==0?'on':''}}">全部</view>
+        <view bindtap='onStsTap' data-sts="1" class="{{sts==1?'on':''}}">待支付</view>
+        <view bindtap='onStsTap' data-sts="7" class="{{sts==7?'on':''}}">收益中</view>
+        <view bindtap='onStsTap' data-sts="7" class="{{sts==8?'on':''}}">挂单中</view>
+        <view bindtap='onStsTap' data-sts="2" class="{{sts==2?'on':''}}">待发货</view>
+        <view bindtap='onStsTap' data-sts="3" class="{{sts==3?'on':''}}">待收货</view>
+        <view bindtap='onStsTap' data-sts="5" class="{{sts==5?'on':''}}">已完成</view>
+      </view>
+    </scroll-view>
+
   </view>
   <!-- end 头部菜单 -->
   <view class='main'>
@@ -21,9 +28,9 @@
         <view class="order-num">
           <text>订单编号：{{item.orderNumber}}</text>
           <view class='order-state'>
-            <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 11挂单待付款 -->
+            <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9已退单 10完成 11挂单待付款 -->
             <text
-              class="order-sts  {{item.status==1?'red':''}}  {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'退单中':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
+              class="order-sts  {{item.status==1?'red':''}}  {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'已退单':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
             <view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}">
               <image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList'
                 data-ordernum="{{item.orderNumber}}"></image>
@@ -89,7 +96,7 @@
             <text class='big-num'>{{wxs.parsePrice(item.orderIncome.incomeAmount)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(item.orderIncome.incomeAmount)[1]}}</text>
           </view>
-           <!-- <view class='prodprice'>可提现：
+          <!-- <view class='prodprice'>可提现：
             <text class='symbol'>￥</text>
             <text class='big-num'>{{wxs.parsePrice(item.orderIncome.toCashAmmount)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(item.orderIncome.toCashAmmount)[1]}}</text>
@@ -108,12 +115,12 @@
               data-ordernum="{{item.orderNumber}}" hover-class='none'>查看物流</text>
             <text wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive"
               data-ordernum="{{item.orderNumber}}" hover-class='none'>确认收货</text>
-            <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPendingOrder"
-              data-item="{{item}}" hover-class='none'>挂单</text>
+            <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPendingOrder" data-item="{{item}}"
+              hover-class='none'>挂单</text>
             <text wx:if="{{item.status==7}}" class="button gray" bindtap="onOrderWithdrawal"
               data-ordernum="{{item.orderNumber}}" data-type="2" data-item="{{item}}" hover-class='none'>退单</text>
-            <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPickGoods"
-            data-item="{{item}}" hover-class='none'>提货</text>
+            <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPickGoods" data-item="{{item}}"
+              hover-class='none'>提货</text>
             <text wx:if="{{item.status==7}}" class="button warn" bindtap="onOrderWithdrawal"
               data-ordernum="{{item.orderNumber}}" data-type="1" data-item="{{item}}" hover-class='none'>提现</text>
           </view>

pages/orderList/orderList.wxss

@@ -19,7 +19,16 @@ page {
   background-color: #fff;
   border-bottom: 2rpx solid #f4f4f4;
 }
-
+.flex{
+  display: flex;
+  white-space: nowrap;
+}
+.flex>view{
+  margin: 0 10rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  color: 999;
+}
 .order-tit text {
   display: block;
   font-size: 28rpx;
@@ -28,7 +37,7 @@ page {
   text-align: center;
 }
 
-.order-tit text.on {
+.order-tit view.on {
   border-bottom: 4rpx solid #eb2444;
   color: #eb2444;
 }

pages/orderWithdrawal/orderWithdrawal.js

@@ -19,6 +19,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+ 
   },
 
   /**
@@ -36,7 +37,10 @@ Page({
       type: this.options.type,
       ordernum: this.options.ordernum,
       amount: this.options.amount,
-      orderIncome: JSON.parse(this.options.orderIncome)
+      defaultAmount: this.options.amount,
+      note: `1、退单金额将退还到您的可提现余额中。\n 2、订单没有满以下期限会扣相应的手续费 \n  01、2020年12余额12号之前退款的将扣除本金的35%。 \n  02、2020年12余额12号起订单周期 < 30天，扣本金 15% \n 03、2020年12余额12号起订单周期 30天 < X < 60天，扣本金 12% \n
+      04、2020年12余额12号起订单周期 60天 < X < 90天，扣本金 9% \n 05、2020年12余额12号起订单周期 90 天 < X < 120天，扣本金 6%`,
+       orderIncome: JSON.parse(this.options.orderIncome)
     })
     console.log('list',this.data.type,this.data.ordernum)
     this.getData();
@@ -144,6 +148,10 @@ Page({
       wx.showToast({ title: '请填写提现金额', icon: 'none' })
       return
     }
+    if (parseInt(that.data.amount) > parseInt(that.data.defaultAmount)) {
+      wx.showToast({ title: '提现金额错误', icon: 'none' })
+      return
+    }
     wx.showLoading()
     var params = {
       url: "/cashApplyRecord/applyToCash",

pages/orderWithdrawal/orderWithdrawal.wxml

@@ -2,16 +2,17 @@
 <view class="container">
   <view class='content'>
     <view class='top'>
-      <text class="txt">提现金额</text>
+      <text class="txt">{{type == 2? '退单金额': '提现金额'}}</text>
       <view class="my-input">
         <text>￥</text>
-        <input class='input' type='text' value="{{amount}}" bindinput="amountinput" placeholder-class='phcolor'
-          placeholder='请输入提现金额'></input>
+        <input wx:if="{{type == 2}}" class='input' type='text' value="{{amount}}" bindinput="amountinput" placeholder-class='phcolor'
+          :placeholder="{{type == 2? '请输入退单金额': '请输入提现金额'}}"></input>
+          <text wx:else>{{amount || 0}}</text>
       </view>
       <view class="notice">
-      <text style="margin-right: 20rpx;">可提现金额￥{{amount}}</text>
+        <text style="margin-right: 20rpx;">{{type == 2? '可退单金额': '可提现金额'}}￥{{amount}}</text>
         <text wx:if="{{type == 1}}" style="margin: 0 20rpx;">已提现金额￥{{orderIncome.cashAmomunt}}</text>
-        <text  wx:if="{{type == 1}}" >累计收益金额：{{orderIncome.incomeAmount}}</text>
+        <text wx:if="{{type == 1}}">累计收益金额：{{orderIncome.incomeAmount}}</text>
         <view class="primary" bindtap="allWithdrawal">全部提现</view>
       </view>
     </view>
@@ -19,7 +20,7 @@
 
   <view class="botton-container">
     <!-- <view class='inputimg' type="default" bindtap="gotoShow">点击上传您的收款码</view> -->
-    <view class='inputimg' type="default" bindtap="inputimg">48小时内到账，确认提现</view>
+    <view class='inputimg' type="default" bindtap="inputimg">48小时内到账，{{type == 2? '确认退单': '确认提现'}}</view>
     <!-- <view class='how-container' bindtap="showHow">
       <image class='how-img' src="/images/newly/notice.png"></image>
       <text class='how-txt'>如何上传收款码？</text>
@@ -28,9 +29,9 @@
 
   <view class="notice-container">
     <text class='txt-notice-title'>【温馨提醒】</text>
-    <text class='txt-notice'></text>
-    <text class="txt-notice" wx:if="{{type == 2}}">1 收益提现后将不能提货只能退单; \n 2 收益提现将转入余额; \n 3 退单中的订单将不进行收益</text>
-    <text class="txt-notice" wx:else>1 收益提现后将不能提货只能退单; \n 2 收益提现将转入余额; </text>
+    <text class="txt-notice" wx:if="{{type ==2}}">1、退单金额将退还到您的可提现余额中。 \n 2、订单没有满以下期限会扣相应的手续费 \n  01、2020年12余额12号之前退款的将扣除本金的35%。 \n 02、2020年12余额12号起订单周期 {{'<'}} 30天，扣本金 15% \n 03、2020年12余额12号起订单周期 30天 {{'<'}} X {{'<'}} 60天，扣本金 12% \n 04、2020年12余额12号起订单周期 60天 {{'<'}} X {{'<'}} 90天，扣本金 9% \n 05、2020年12余额12号起订单周期 90 天 {{'<'}} X {{'<'}} 120天，扣本金 6% </text>
+    <text class="txt-notice" wx:else>1、订单收益的提现将提现到您的可提现余额中
+    </text>
   </view>
 
   <view class="coupon-notice-window" wx:if="{{how}}">

pages/orderWithdrawal/orderWithdrawal.wxss

@@ -131,10 +131,11 @@ page {
 }
 
 .notice-container {
-  width: 100%;
+  /* width: 100%; */
   display: flex;
   flex-direction: column;
-  margin-left: 100rpx;
+  /* margin-left: 100rpx; */
+  padding: 0 30rpx;
   margin-top: 50rpx;
 }
 

pages/prod/prod.wxml

@@ -21,6 +21,7 @@
       </view>
     </view>
     <view class="sales-p">{{brief}}</view>
+    <view class="sales-p">发货时间:2020年12月12号开始陆续发货。</view>
     <view class="prod-price">
       <text class="price">￥<text class="price-num">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}</text>
       <text class="sales"></text>

pages/submit-order/submit-order.wxml

@@ -83,6 +83,10 @@
           <text class='coupon-btn'>{{coupons.totalLength? coupons.totalLength: 0}}张</text>
           <text class='arrow'></text>
         </view>
+        <view class='item' style=" border-bottom: 2rpx solid #f1f1f1;">
+          <text style="white-space: nowrap;">首发：</text>
+          <text style="font-size: 20rpx;">中国北斗芯片与北斗天汇应用平台首发北斗拐途联名手表，共同见证2020年12年12日拐途开机发布会＆启动新品配发仪式！</text>
+        </view>
         <view class='item'>
           <text>买家留言：</text>
           <input placeholder='给卖家留言'></input>
@@ -121,8 +125,8 @@
           <view class='item-txt price'>
             小计：
             <text class='symbol'>￥</text>
-            <text class='big-num'>{{wxs.parsePrice(actualTotal)[0]}}</text>
-            <text class='small-num'>.{{wxs.parsePrice(actualTotal)[1]}}</text>
+            <text class='big-num'>{{wxs.parsePrice(total)[0]}}</text>
+            <text class='small-num'>.{{wxs.parsePrice(total)[1]}}</text>
           </view>
         </view>
       </view>
@@ -164,8 +168,8 @@
         合计：
         <view class='price'>
           <text class='symbol'>￥</text>
-          <text class='big-num'>{{wxs.parsePrice(actualTotal)[0]}}</text>
-          <text class='small-num'>.{{wxs.parsePrice(actualTotal)[1]}}</text>
+          <text class='big-num'>{{wxs.parsePrice(total)[0]}}</text>
+          <text class='small-num'>.{{wxs.parsePrice(total)[1]}}</text>
         </view>
       </view>
     </view>

pages/user/user.js

@@ -14,7 +14,11 @@ Page({
     userAccount: '',
     userCount: ''
   },
-
+  goLogin(){
+    wx.navigateTo({
+      url: '/pages/login/login',
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -53,8 +57,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    console.log(wx.getStorageSync('token')? true: false,wx.getStorageSync('token'))
     this.setData({
-      userInfo: app.globalData.userInfo
+      userInfo: app.globalData.userInfo,
+      isLogin:  wx.getStorageSync('token')? true: false
     })
     //加载订单数字
     var ths = this;

pages/user/user.wxml

 <!--pages/user/user.wxml-->
 <view class='container'>
   <!-- 用户信息 -->
-  <view class='userinfo'>
+  <view class='userinfo' bindtap="goLogin">
     <view class='userinfo-avatar'>
-      <open-data type="userAvatarUrl"></open-data>
-      <!-- <image class="user-icon" src="{{userInfo.pic}}"></image> -->
+      <open-data type="userAvatarUrl" wx:if="isLogin"></open-data>
+      <image class="user-icon" src="{{userInfo.pic}}" wx:else></image>
     </view>
     <view class='userinfo-name'>
-      <open-data type="userNickName"></open-data>
-      <!-- <view>{{userInfo.nickName  || '未登录'}}</view> -->
+      <open-data type="userNickName" wx:if="isLogin"></open-data>
+      <view wx:else>请点击登录</view>
     </view>
   </view>
   <view class="prod-col" style="margin-top: 0;padding-top: 0;">

pages/userAccount/balanceWithdraw/index.js

@@ -67,6 +67,9 @@ Page({
    */
   onShow: function () {
     this.getData();
+    this.setData({
+      amount: this.options.balance
+    })
   },
 
   /**
@@ -181,8 +184,12 @@ Page({
     //   return
     // }
     var stockAmount = /^\d{1,}$/
-    if (!stockAmount.test(that.data.amount)) {
-      wx.showToast({ title: '请填写提现金额', icon: 'none' })
+    if ((!stockAmount.test(that.data.amount))) {
+      wx.showToast({ title: '请填写提现金额且要大于100元', icon: 'none' })
+      return
+    }
+    if (parseInt(that.data.amount) < parseInt(100)) {
+      wx.showToast({ title: '提现金额不能小于100', icon: 'none' })
       return
     }
     wx.showLoading()

pages/userAccount/balanceWithdraw/index.wxml

@@ -46,11 +46,11 @@
     </view>
   </view>
 
-  <view class="notice-container">
+  <!-- <view class="notice-container">
     <text class='txt-notice-title'>【温馨提醒】</text>
     <text class='txt-notice'></text>
     <text class='txt-notice'>1、金额满100元方可提现；\n2、提现收{{rate}}%手续费；\n3、购物可全额抵扣；</text>
-  </view>
+  </view> -->
 
   <view class="coupon-notice-window" wx:if="{{how}}">
     <view class="container">

utils/http.js

@@ -22,6 +22,7 @@ function request(params, isGetTonken) {
     responseType: params.responseType == undefined ? 'text' : params.responseType,
     success: function (res) {
       console.log('res',res)
+      wx.hideLoading()
       if (res.statusCode == 200) {
         console.log(res.data.code)
         //如果有定义了params.callBack，则调用 params.callBack(res.data)
@@ -51,7 +52,7 @@ function request(params, isGetTonken) {
         // if (!globalData.isLanding) {
         globalData.isLanding = true
         //重新获取token,再次请求接口
-        getApp().goLogin()
+        // getApp().goLogin()
         // }
       } else if (res.statusCode == 400) {
         wx.showToast({