From 4b99efa2943316f70354ab3f343f405e860c6e2b Mon Sep 17 00:00:00 2001
From: initwithout <initwithout@163.com>
Date: Mon, 24 Apr 2023 09:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/钱包支付.png        | Bin 0 -> 2306 bytes
 pages/cart/cart.wxss           |  14 +--
 pages/login/login.js           |  53 ++++------
 pages/logistics/logistics.wxss |   1 -
 pages/order/order.js           |  14 ++-
 pages/order/pay.js             |  28 +++++-
 pages/order/pay.wxml           | 171 +++++++++++++++++----------------
 pages/order/pay.wxss           |   7 +-
 pages/set/set.js               |   8 +-
 pages/user/user.js             |  29 ++++--
 pages/user/user.wxml           |   3 +-
 utils/server.js                |   4 +-
 12 files changed, 181 insertions(+), 151 deletions(-)
 create mode 100644 images/钱包支付.png

diff --git a/images/钱包支付.png b/images/钱包支付.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ad75618369ebd2e68b768c0abbd9e5fa7238547
GIT binary patch
literal 2306
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

literal 0
HcmV?d00001

diff --git a/pages/cart/cart.wxss b/pages/cart/cart.wxss
index b5dc8e4..468b214 100644
--- a/pages/cart/cart.wxss
+++ b/pages/cart/cart.wxss
@@ -140,8 +140,8 @@ page{
   height:160rpx;
   border: 1px solid #eee;
 }
- .kong{
-     width:200rpx;
+.kong{
+  width:200rpx;
   height:200rpx;
  }
  
@@ -290,24 +290,24 @@ page{
     padding-bottom: 60rpx;
 }
 .reds{
-    color: red;
+  color: red;
 
 }
 
 
 .pp{
   text-align: center;
-  margin-top:264rpx; 
+  margin-top:300rpx; 
 }
 .cla{
-      font-family: '微软雅黑';
-      color: #ccc;
+  font-family: '微软雅黑';
+  color: #ccc;
 }
 .heji{
   display:flex;
   align-items:center;
   width: 71%;
-   border-top: 1px solid #eee;
+  border-top: 1px solid #eee;
 }
 
 
diff --git a/pages/login/login.js b/pages/login/login.js
index a1b7756..c17c77b 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -73,27 +73,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.reloadData()
-  },
-  reloadData() {
-    var that = this
-    wx.login({
-      success: function (res) {
-        var code = res.code;
-        that.setData({
-          code: code,
-        })
-        WXAPI.getWXTemplates({
-          storeId: 239,
-          storeType: 1,
-        }).then(res => {
-          if (res.code == 200) {
-            var data = res.data
-            wx.setStorageSync('logmsgId', [data.delivery])
-          }
-        })
-      }
-    });
+
   },
   // wxlogin(){
   //   var that = this
@@ -136,20 +116,25 @@ Page({
   //微信一键登录
   tapWeixinLogin : function(e) {
     var that = this
-    WXAPI.wxLogin({
-      code: that.data.code,
-      storeId: 239,
-      storeType: 1,
-    }).then(res => {
-      if (res.code == 200) {
-        var data = res.data
-        app.globalData.accessId = data.access_id;
-        wx.setStorageSync('accessId', data.access_id)
-        wx.setStorageSync('isLogin', true);
-        wx.setStorageSync('userInfo', data.user);
-        wx.navigateBack()
+    wx.login({
+      success: function (res) {
+        var code = res.code;
+        WXAPI.wxLogin({
+          code: code,
+          storeId: 239,
+          storeType: 1,
+        }).then(res => {
+          if (res.code == 200) {
+            var data = res.data
+            app.globalData.accessId = data.access_id;
+            wx.setStorageSync('accessId', data.access_id)
+            wx.setStorageSync('isLogin', true);
+            wx.setStorageSync('userInfo', data.user);
+            wx.navigateBack()
+          }
+        })
       }
-    })
+    });
   },
   /**
    * 生命周期函数--监听页面显示
diff --git a/pages/logistics/logistics.wxss b/pages/logistics/logistics.wxss
index aad3a39..9bd69fb 100644
--- a/pages/logistics/logistics.wxss
+++ b/pages/logistics/logistics.wxss
@@ -14,7 +14,6 @@
   position: relative;
 }
 .logistics_centent{  
-  /* position: absolute; */
   margin-top: -25rpx;
   margin-left: 100rpx;  
   font-size: 30rpx;  
diff --git a/pages/order/order.js b/pages/order/order.js
index d4a8602..478c4eb 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -223,8 +223,20 @@ Page({
       currentStatus: options.status
     })
     that.reloadData();
+    that.getWXTemplate()
+  },
+  getWXTemplate() {
+    WXAPI.getWXTemplate({
+      storeId: 239,
+      storeType: 1,
+      type: 2,
+    }).then(res => {
+      if (res.code == 200) {
+        var data = res.data
+        wx.setStorageSync('logmsgId', [data.template_id])
+      }
+    })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/order/pay.js b/pages/order/pay.js
index 1363c70..45c8a88 100644
--- a/pages/order/pay.js
+++ b/pages/order/pay.js
@@ -7,7 +7,7 @@ Page({
     pays: [],
     itemData: {},
     userId: 0,
-    paytype: 'wxPay', //支付方式
+    paytype: 'bank_pay', //支付方式
     cartId: 0,
     addrId: 0, //收货地址//测试--
     btnDisabled: false,
@@ -71,7 +71,6 @@ Page({
       }
     }
   },
-
   onLoad: function (options) {
     // console.log(options)
     var that = this;
@@ -91,6 +90,19 @@ Page({
       wallet: wallet, // 钱包状态
     });
     this.Settlement(options);
+    this.getWXTemplate();
+  },
+  getWXTemplate() {
+    WXAPI.getWXTemplate({
+      storeId: 239,
+      storeType: 1,
+      type: 2,
+    }).then(res => {
+      if (res.code == 200) {
+        var data = res.data
+        wx.setStorageSync('logmsgId', [data.template_id])
+      }
+    })
   },
   //页面加载完成函数
   onReady: function () {
@@ -156,6 +168,12 @@ Page({
     // }
 
   },
+  //单选支付方式
+  updataRadio:function(e){
+    this.setData({
+      paytype: e.detail.value
+    })
+  },
   // 进入结算页面
   Settlement: function (options) {
     var that = this;
@@ -181,10 +199,10 @@ Page({
         }
         var pays = []
         if (data.payment.bank_pay == 1) {
-          pays.push({'name':'公对公支付','icon':'/images/公对公.png'})
+          pays.push({'name':'公对公支付','icon':'/images/公对公.png','type':'bank_pay','checked':true})
         } 
         // if (data.payment.wallet_pay == 1) {
-        //   pays.push({'name':'余额支付','icon':'/images/weixin.png'})
+        //   pays.push({'name':'余额支付','icon':'/images/钱包支付.png','type':'wallet_pay','checked':false})
         // }
         that.setData({
           productAry: options.product,
@@ -542,7 +560,7 @@ Page({
       remarks: '',
       vipSource: 0,
       product: that.data.productAry,
-      pay_type: 'bank_pay',
+      pay_type: that.data.paytype,
     }).then(res => {
       if (res.code == 200) {
         var data = res.data
diff --git a/pages/order/pay.wxml b/pages/order/pay.wxml
index 29f8c12..d6f21e7 100644
--- a/pages/order/pay.wxml
+++ b/pages/order/pay.wxml
@@ -25,111 +25,112 @@
 <!-- 加载页面结束 -->
 <block wx:else>
   <!--普通结算开始  -->
-    <view class="w100" style='padding-bottom:100px;'>
-      <!-- 收货地址 -->
-      <view class="p_all bg_white mt10 font_14 top_xt" wx:if="{{addrId != ''}}">
-      <view bindtap='go'  data-url="../address/index?cartId={{cartId}}" hover-class="none">
-          <view class="df">
-            <view class='iconfont icon-dizhi' style='margin:auto 0;'></view>
-            <view class="df_1 c6">
-              <view class="l_h20 pay_xt" style='color:#333333;font-size:16px;'>
-                <text style='color:#333333;font-size:18px;'>{{address.name}}</text>　{{address.tel}}</view>
-              <view class="l_h20 mt5 pay_xt" style='color:#333333;padding:0 4px;'>地址：{{address.address_xq}}</view>
-              <input type="text" style='display:none;' name="address" value="{{address.address_xq}}" />
+  <view class="w100" style='padding-bottom:100px;'>
+    <!-- 收货地址 -->
+    <view class="p_all bg_white mt10 font_14 top_xt" wx:if="{{addrId != ''}}">
+      <view bindtap='go' data-url="../address/index?cartId={{cartId}}" hover-class="none">
+        <view class="df">
+          <view class='iconfont icon-dizhi' style='margin:auto 0;'></view>
+          <view class="df_1 c6">
+            <view class="l_h20 pay_xt" style='color:#333333;font-size:16px;'>
+              <text style='color:#333333;font-size:18px;'>{{address.name}}</text>　{{address.tel}}
             </view>
-            <image class="x_right mt15" src="/images/x_right.png"></image>
+            <view class="l_h20 mt5 pay_xt" style='color:#333333;padding:0 4px;'>地址：{{address.address_xq}}</view>
+            <input type="text" style='display:none;' name="address" value="{{address.address_xq}}" />
           </view>
+          <image class="x_right mt15" src="/images/x_right.png"></image>
         </view>
       </view>
-      <view class="p_all bg_white mt10 font_14" wx:else>
-        <view bindtap='go' data-url="../address/index?cartId={{cartId}}" hover-class="none">
-          <view class="df">添加收货地址</view>
-        </view>
+    </view>
+    <view class="p_all bg_white mt10 font_14" wx:else>
+      <view bindtap='go' data-url="../address/index?cartId={{cartId}}" hover-class="none">
+        <view class="df">添加收货地址</view>
       </view>
-      <view style='height:10px;width:100%;background:#eee;'></view>
-      <!-- 产品信息 -->
-      <view class="shop-list" wx:key="key" wx:for="{{productData}}" >
+    </view>
+    <view style='height:10px;width:100%;background:#eee;'></view>
+    <!-- 产品信息 -->
+    <view class="shop-list" wx:key="key" wx:for="{{productData}}">
       <view class="shopView">
         <image src="{{item.shop_logo}}" mode="aspectFill"></image>
         <text class="left">{{item.shop_name}}</text>
         <image class="jiantou-img" src="/images/x_right.png" mode="aspectFill"></image>
       </view>
       <view style="margin-left:30rpx;width:720px;height:2rpx;background-color:#eee;"></view>
-        <view class="p_all bg_white df item" style='height:70px;' wx:key="key" wx:for="{{item.list}}">
-          <view class="cp_photo">
-            <image src="{{item.img}}" mode="aspectFill"></image>
-          </view>
-          <view class="df_1">
-            <view class="sp_text">
-              <view style='width:70%;'>
-                <view class="sp_tit ovh1" style="color: #000;">{{item.product_title}}</view>
-                <view class="sp_tit ovh1" style='color:#808080'>[{{item.size}}]</view>
-                <view class='sp_tit ovh1'>¥ {{item.price}} </view>
-              </view>
-              <view class="sp_jg">
-                <view class='guige'>x{{item.num}}</view>
-              </view>
-            </view>
-
-          </view>
+      <view class="p_all bg_white df item" style='height:70px;' wx:key="key" wx:for="{{item.list}}">
+        <view class="cp_photo">
+          <image src="{{item.img}}" mode="aspectFill"></image>
         </view>
-      </view>
-        
-        <!-- 信息 -->
-        <view style='background:#fff;'>
-          <view class="pay_qb pd" style='border-bottom:1px solid #eee;'>
-            <text class="left">运费</text>
-            <text wx:if="{{freight == 0}}" class="right">包邮</text>
-            <text wx:else class="right">{{freight}}元</text>
-          </view>
-          <view wx:if="{{discount}}" bindtap="setModalStatus" data-type="" data-status="1" style='border-bottom:1px solid #eee;padding:10px;'>
-            <view style='float:left;font-size:16px;'>优惠券</view>
-            <view style='float:right'>
-              <text wx:if="{{money}}" class="right" style="font-size: 16px;">使用优惠券:{{money}}</text>
-              <image src='../../images/x_right.png' style='width:25rpx;height:25rpx;'></image>
-            </view>
-            <view style='clear:both;'></view>
-          </view>
-          <view class="pay_zf pd" wx:if="{{name}}">
-            <text class="left">活动</text>
-            <text class="right" style='color:{{bgcolor}};'>{{name}}</text>
-          </view>
-          <view class="pay_qb pd" style='border-bottom:1px solid #eee;'>
-            <text class="left">钱包余额</text>
-            <text wx:if="{{d_yuan}}" class="right">余额抵扣{{d_yuan}}</text>
-            <text wx:else class="right">{{user_money}}元</text>
-          </view>
-          <view wx:if="{{pay_xs}}">
-            <view style='height:10px;width:100%;background:#eee;'></view>
-            <view class="pay_zf pd">
-              <text class="left">选择支付方式</text>
+        <view class="df_1">
+          <view class="sp_text">
+            <view style='width:70%;'>
+              <view class="sp_tit ovh1" style="color: #000;">{{item.product_title}}</view>
+              <view class="sp_tit ovh1" style='color:#808080'>[{{item.size}}]</view>
+              <view class='sp_tit ovh1'>¥ {{item.price}} </view>
             </view>
-            <view class="pay_zf pd" style='border-bottom:none;padding-right:3px;'>
-              <checkbox-group class="radio-group left">
-                <label class="radio" wx:for-items="{{pays}}" wx:key="key" style='border-bottom:1px solid #eee;'>
-                  <view class="payment">
-                    <image src='{{item.icon}}'></image>
-                    <text>{{item.name}}</text>
-                    <!-- <switch bindchange="switchChange" checked="{{item.checked}}" data-index="{{index}}" data-check="{{item.value}}" class="right" style='vertical-align:2px;float:right;margin-bottom:20px;' /> -->
-                  </view>
-                </label>
-              </checkbox-group>
+            <view class="sp_jg">
+              <view class='guige'>x{{item.num}}</view>
             </view>
           </view>
+
         </view>
+      </view>
+    </view>
 
-        <!--普通结束 -->
-        <!-- 结算 -->
-        <view class='pay_foot'>
-          <view class="pay_fk">
-            <view class="zhifu mt10 ">合计：
-              <span class="font_20 red" total="{{total}}">¥ {{total}}</span>
+    <!-- 信息 -->
+    <view style='background:#fff;'>
+      <view class="pay_qb pd" style='border-bottom:1px solid #eee;'>
+        <text class="left">运费</text>
+        <text wx:if="{{freight == 0}}" class="right">包邮</text>
+        <text wx:else class="right">{{freight}}元</text>
+      </view>
+      <view wx:if="{{discount}}" bindtap="setModalStatus" data-type="" data-status="1" style='border-bottom:1px solid #eee;padding:10px;'>
+        <view style='float:left;font-size:16px;'>优惠券</view>
+        <view style='float:right'>
+          <text wx:if="{{money}}" class="right" style="font-size: 16px;">使用优惠券:{{money}}</text>
+          <image src='../../images/x_right.png' style='width:25rpx;height:25rpx;'></image>
+        </view>
+        <view style='clear:both;'></view>
+      </view>
+      <view class="pay_zf pd" wx:if="{{name}}">
+        <text class="left">活动</text>
+        <text class="right" style='color:{{bgcolor}};'>{{name}}</text>
+      </view>
+      <view class="pay_qb pd" style='border-bottom:1px solid #eee;'>
+        <text class="left">钱包余额</text>
+        <text wx:if="{{d_yuan}}" class="right">余额抵扣{{d_yuan}}</text>
+        <text wx:else class="right">{{user_money}}元</text>
+      </view>
+      <view wx:if="{{pay_xs}}">
+        <view style='height:10px;width:100%;background:#eee;'></view>
+        <view class="pay_zf pd">
+          <text class="left">选择支付方式</text>
+        </view>
+        <view class="pay_zf pd" style='border-bottom:none;padding-right:3px;'>
+          <radio-group class="radio-group left" bindchange="updataRadio">
+            <view class="radio" wx:for="{{pays}}" wx:key="key">
+              <view class="payment">
+                <image src='{{item.icon}}'></image>
+                <text>{{item.name}}</text>
+                <radio class="select" value="{{item.type}}" checked="{{item.checked}}" />
+              </view>
             </view>
-            <button wx:if="{{pay_xs}}" class="right btn_zf" type="primary" id="{{paytype}}" style='background:#FA5151;;border-radius:0;' disabled="{{btnDisabled}}" formType="submit" bindtap="createProductOrderByWX">立即支付</button>
-            <button wx:else class="right btn_zf" type="primary" id="{{paytype}}" style='background:background;border-radius:0;' disabled="{{btnDisabled}}" formType="submit">提交订单</button>
-          </view>
+          </radio-group>
+        </view>
+      </view>
+    </view>
+
+    <!--普通结束 -->
+    <!-- 结算 -->
+    <view class='pay_foot'>
+      <view class="pay_fk">
+        <view class="zhifu mt10 ">合计：
+          <span class="font_20 red" total="{{total}}">¥ {{total}}</span>
         </view>
+        <button wx:if="{{pay_xs}}" class="right btn_zf" type="primary" id="{{paytype}}" style='background:#FA5151;;border-radius:0;' disabled="{{btnDisabled}}" formType="submit" bindtap="createProductOrderByWX">立即支付</button>
+        <button wx:else class="right btn_zf" type="primary" id="{{paytype}}" style='background:background;border-radius:0;' disabled="{{btnDisabled}}" formType="submit">提交订单</button>
+      </view>
     </view>
+  </view>
   <!--普通结算结束  -->
 </block>
 
diff --git a/pages/order/pay.wxss b/pages/order/pay.wxss
index ee01a9c..ad93656 100644
--- a/pages/order/pay.wxss
+++ b/pages/order/pay.wxss
@@ -596,8 +596,6 @@ color:#fff;
   /* color: #FF6347; */
 }
 
-
-
 .radio-group {
  display:block;
  width:100%;
@@ -615,7 +613,10 @@ color:#fff;
 .payment text{
   margin-left: 15rpx;
 }
-
+.select{
+  position: absolute;
+  right: 20rpx;
+}
 /*优惠券 */
 .orderDetails {
   border-bottom: 10px solid #f3f3f3;
diff --git a/pages/set/set.js b/pages/set/set.js
index 3267335..853a9a7 100644
--- a/pages/set/set.js
+++ b/pages/set/set.js
@@ -72,9 +72,11 @@ Page({
         wx.clearStorage({
           success: (res) => {
             wx.clearStorageSync('isLogin');
-            wx.reLaunch({
-              url: '/pages/login/login',
-            })
+            wx.clearStorageSync('accessId');
+            wx.navigateBack()
+            // wx.reLaunch({
+            //   url: '/pages/login/login',
+            // })
           },
         })
       } else {
diff --git a/pages/user/user.js b/pages/user/user.js
index b9e01b7..493724f 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -41,6 +41,8 @@ Page({
 		remind: '加载中',
     tjr: false,
     user:'',
+    xxnum: 0,
+    accessId: app.globalData.accessId,
 	},
 	//下拉刷新
 	onPullDownRefresh: function () {
@@ -81,14 +83,14 @@ Page({
   },
 	onShow: function () {
     var that = this;
-		var cont = that.data.cont;
-		if (cont > 1) {
+		// var cont = that.data.cont;
+		// if (cont > 1) {
 			that.requestMyData();
-		} else {
-			that.setData({
-				cont: cont + 1
-			})
-		}
+		// } else {
+		// 	that.setData({
+		// 		cont: cont + 1
+		// 	})
+		// }
   },
 	requestMyData: function () {
     var that = this;
@@ -102,8 +104,8 @@ Page({
         var data = res.data;
 				if (data.data) {
           that.setData({
+            xxnum: data.data.xxnum,
             user: data.data.user,
-            // article: data.data.article,
             logo: data.data.logo,
             company: data.data.company,
             th: data.data.th,
@@ -117,6 +119,17 @@ Page({
           });
         }
         else {
+          that.setData({
+            xxnum: '',
+            user: '',
+            logo: '',
+            company: '',
+            th: '',
+            dfh_num: '',
+            dfk_num: '',
+            dpj_num: '',
+            dsh_num: '',
+          });
           wx.removeStorageSync('accessId')
           wx.removeStorageSync('isLogin');
           wx.removeStorageSync('userInfo');
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index cc157f2..e7a63a0 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -54,8 +54,7 @@
         <view class="top-message">
           <image src="/images/grxx.png" class="btnimgl" lazy-load="true" bindtap="navToNotice">
           </image>
-          <view class="xxnum" v-if="access_id1&&user.xxnum>0">{{ user.xxnum > 99 ? '99+' : user.xxnum }}
-          </view>
+          <view class="xxnum" wx:if="{{xxnum>0}}">{{ xxnum > 99 ? '99+' : xxnum }}</view>
         </view>
       </view>
 
diff --git a/utils/server.js b/utils/server.js
index 3149730..d6c06ba 100644
--- a/utils/server.js
+++ b/utils/server.js
@@ -65,8 +65,8 @@ module.exports = {
   logout: (data) => {  //退出登录
     return requestServer('app.login.quit', 'post', data)
   },
-  getWXTemplates: (data) => {  //获取订阅消息模板
-    return requestServer('app.message.getWxTemplates', 'post', data)
+  getWXTemplate: (data) => {  //获取订阅消息模板
+    return requestServer('app.message.getWxTemplate', 'post', data)
   },
   /* 首页 */
   homeIndex: (data) => { //首页