新增支付成功显示页面，首页判断用户是否登录,界面调整

前端研发-钱巧玲
1 parent 22973097
Showing 18 changed files with 408 additions and 131 deletions
app.json
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.json
pages/giftpack/buygiftpack/giftpackbuy.wxml
pages/giftpack/buygiftpack/giftpackbuy.wxss
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.json
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/giftpacklist/giftpacklist.wxss
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/giftpack/mygiftpack/mygiftpack.wxss
pages/giftpack/payment/payment.js
pages/giftpack/payment/payment.json
pages/giftpack/payment/payment.wxml
pages/giftpack/payment/payment.wxss
pages/user/index/index.js
pages/user/index/index.wxml
 {
-  "pages": [   
+  "pages": [
     "pages/index/index/index",
+    "pages/giftpack/payment/payment",
+    "pages/giftpack/buygiftpack/giftpackbuy",
+    "pages/giftpack/giftpacklist/giftpacklist",
+    "pages/giftpack/mygiftpack/mygiftpack",
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
     "pages/cart/cart2/cart2",
@@ -77,7 +81,6 @@
     "pages/user/my_service/tment_eval",
     "pages/user/my_service/tment_order_list",
     "pages/user/my_service/beauty_deta",
-
     "pages/user/labels/labels"
   ],
   "permission": {
@@ -11,8 +11,8 @@ Page({
     getStorageID: '',
     getUserID: '',
     wareCard: [],
-    page: 0,
-    pageSize: 10,
+    // page: 0,
+    // pageSize: 10,
     isEmpty: false,
     loadingType: 0, //定义加载方式 0---contentdown  1---contentrefresh 2---contentnomore
     contentText: {
@@ -23,7 +23,7 @@ Page({
     ismore: 0, //数据是否全部加载完成
     is_read: 0, //是否查询过我的礼包接口
     curpage: 1, //当前分页数
-    pageSize: 3, //页大小
+    pageSize: 10, //页大小
     total: 0, //总数量
   },
   onLoad: function(options) {
@@ -51,6 +51,7 @@ Page({
     var th = this;
     var id = e.currentTarget.dataset.id; //活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    var order_sn = e.currentTarget.dataset.order_sn;//订单号
     my_confirm.open(
       "是否确定购买该礼包",
       "取消",
@@ -81,17 +82,17 @@ Page({
           success: function(res) {
             if (res.data.code == 0) {
               res = res.data.data;
+              var url = "/pages/giftpack/payment/payment?type=" + 1 + "order_sn=" + order_sn;
               wx.requestPayment({
                 timeStamp: String(res.timeStamp),
                 nonceStr: res.nonceStr,
                 package: res.packageValue,
                 signType: res.signType,
                 paySign: res.paySign,
-                success: function(n) {
-
+                success: function(res) {
+                  getApp().goto(url);
                 },
-                fail: function(n) {
-
+                fail: function(res) {
                 }
               });
             } else {
@@ -196,9 +197,7 @@ Page({
   navigateTo: function(e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: url,
-    })
+    getApp().goto(url);
   },
   //下拉事件
   onReachBottom: function() {
@@ -210,5 +209,16 @@ Page({
     })
     th.getList();
   },
-
+  //图片失败，默认图片
+  bind_bnerr2: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "/public/images/empty.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+  },
+  goto: function(e) {
+    var th = this;
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  }
 })
 \ No newline at end of file
 {
   "navigationBarTitleText": "礼包列表",
-  "navigationStyle": "custom",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
 <view class="top_img">
   <view class="top_img">
-    <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true"></image>
+    <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
   </view>
   <view class="top_title">
     <view class="top_title_box">
@@ -13,13 +13,13 @@
   </view>
   <block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index">
     <view class="content_box">
-      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn={{items.orderSn}}">
+      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn=''">
         <view class="content_box_img">
-          <image src="{{iurl+items.lbUrl}}" lazy-load="true"></image>
+          <image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
         </view>
         <view class="content_box_title">
           <view class="content_ware_title">
-            <text bindtap="__e">{{items.giftTitle}}</text>
+            <text>{{items.giftTitle}}</text>
           </view>
           <view class="content_ware_type flex">
             <block wx:if="{{items.payMoney>0}}">
@@ -48,15 +48,29 @@
           <text>{{"已售:"+items.giftQty+"件"}}</text>
         </view>
         <view class="flex-vertical">
-          <block wx:if="{{items.payMoney>0}}">
-            <view class="box_button_buy" bindtap="GetBuyPrice" data-id="{{items.lbId}}">
-              <button>立即购买</button>
-            </view>
+          <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
+            <block wx:if="{{items.payMoney>0}}">
+              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}">
+                <button class="box_button_dui">立即购买</button>
+              </view>
+            </block>
+            <block wx:if="{{items.payIntegral>0}}">
+              <view class="flex" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
+                <button class="box_button_dui box_button_buy">立即兑换</button>
+              </view>
+            </block>
           </block>
-          <block wx:if="{{items.payIntegral>0}}">
-            <view class="box_button_dui" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
-              <button>立即兑换</button>
-            </view>
+          <block wx:else>
+            <block wx:if="{{items.payMoney>0}}">
+              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}">
+                <button class="box_button_dui box_button_buy">立即购买</button>
+              </view>
+            </block>
+            <block wx:if="{{items.payIntegral>0}}">
+              <view class="flex" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
+                <button class="box_button_dui box_button_buy">立即兑换</button>
+              </view>
+            </block>
           </block>
         </view>
       </view>
@@ -71,7 +85,7 @@
         <text>当前暂无礼包</text>
       </view>
       <view class="foot_empty_button">
-        <text bindtap="__e">去获取</text>
+        <text bindtap="goto" data-url="/pages/index/index/index">回到首页</text>
       </view>
     </view>
   </block>
@@ -150,16 +150,12 @@ page {
   line-height: 110rpx;
 }
-.box_button_remark {
- 
-}
-
 .box_button_remark text {
   font-size: 28rpx;
   color: #b9b5b5;
 }
-.box_button_buy button {
+.box_button_dui {
   display: inline-block;
   width: 160rpx;
   height: 50rpx;
@@ -167,17 +163,14 @@ page {
   background: #fff;
   color: #000;
   line-height: 50rpx;
+  margin-left: 20rpx;
+  border-radius: 10rpx;
 }
-.box_button_dui button {
-  display: inline-block;
-  width: 160rpx;
-  height: 50rpx;
-  font-size: 20rpx;
+.box_button_buy {
   background: #d41c34;
   color: #fff;
-  line-height: 50rpx;
-  margin-left: 20rpx;
+  border-radius: 10rpx;
 }
 .foot_box {
@@ -22,7 +22,8 @@ Page({
     getUrl: '',
     wareCard: [],
     orderSn: "", //订单编号
-    lbId:""
+    lbId: "",
+    code: "", //核销码
   },
   onLoad: function(options) {
     var th = this;
@@ -43,17 +44,9 @@ Page({
     })
   },
   onShow: function() {
-    // var th = this;
-    // if (th.data.isBuy == 0) {
-    //   th.GetMyGiftList();
-    // } else {
-    //   th.GetBuyGiftList();
-    // }
-    // th.setData({
-    //   giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
-    // })
+
   },
-  GetBuyPrice: function (e) {
+  GetBuyPrice: function(e) {
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
@@ -62,10 +55,10 @@ Page({
       "是否确定购买该礼包",
       "取消",
       "确定",
-      function () {
+      function() {
         my_confirm.open_cancel(0);
       },
-      function () {
+      function() {
         my_confirm.open_cancel(0);
         var json = {
           "actId": '', //活动Id
@@ -85,7 +78,7 @@ Page({
           header: {
             'content-type': 'application/json'
           }, // 设置请求的 header
-          success: function (res) {
+          success: function(res) {
             if (res.data.code == 0) {
               res = res.data.data;
               wx.requestPayment({
@@ -94,10 +87,10 @@ Page({
                 package: res.packageValue,
                 signType: res.signType,
                 paySign: res.paySign,
-                success: function (n) {
+                success: function(n) {
                 },
-                fail: function (n) {
+                fail: function(n) {
                 }
               });
@@ -114,7 +107,7 @@ Page({
   },
-  GetBuyIntegral: function (e) {
+  GetBuyIntegral: function(e) {
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
@@ -123,10 +116,10 @@ Page({
       "是否确定兑换该礼包",
       "取消",
       "确定",
-      function () {
+      function() {
         my_confirm.open_cancel(0);
       },
-      function () {
+      function() {
         my_confirm.open_cancel(0);
         var json = {
           "actId": '', //活动Id
@@ -145,7 +138,7 @@ Page({
           header: {
             'content-type': 'application/json'
           }, // 设置请求的 header
-          success: function (res) {
+          success: function(res) {
             if (res.data.code == 0) {
               getApp().my_warnning("兑换成功！", 1, th);
             } else {
@@ -236,7 +229,7 @@ Page({
             giftPrice: res.data.data.payMoney,
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
-            wareCard: res.data.data.wareCard,
+            wareCard: res.data.data.wareCard
           })
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
@@ -246,22 +239,59 @@ Page({
     });
   },
-  GetQrCode: function() {
-    //不销毁调整
-    uni.navigateTo({
-      url: '/pages/mygiftpack/QrCode?number=' + this.getGiftID
-    });
-
+  //显示核销码
+  code_show: function(e) {
+    var th = this;
+    //--获取成功的时候--
+    var no = th.data.code;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    var obj = {
+      val: no,
+      content: "请将二维码展示给核销员，收货更快捷"
+    };
+    qc_com.open(obj)
   },
-  GetWebHttp: function(type) {
-
-    if (type == 0) {
-      this.getUrl = this.$GetInfo.HtmlHttp + '/index.php/Mobile/User/coupon/stoid/' + this.getStorageID + '/user_id/' + this.getUserID + '.html';
-    }
-    if (type == 1) {
-      this.getUrl = this.$GetInfo.HtmlHttp + '/index.php/Mobile/Yyservice/service_items_list/stoid/' + this.getStorageID + '/user_id/' + this.getUserID + '.html';
-    }
-    window.location.href = this.getUrl;
-  }
+  //获取核销码
+  getcode: function() {
+    var th = this;
+    var orderSn = th.data.orderSn; //订单号
+    var json = {
+      "storeId": a.stoid,
+      "orderSn": orderSn
+    };
+    var data = JSON.stringify(json);
+    var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
+    wx.request({
+      url: url,
+      data: data,
+      method: 'put',
+      header: {
+        'content-type': 'application/json'
+      }, // 设置请求的 header
+      success: function(res) {
+        if (res.data.code == 0) {
+          th.setData({
+            code: res.data.data
+          })
+          th.code_show();
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+        }
+      }
+    })
+  },
+  //界面跳转
+  goto: function(e) {
+    var th = this;
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  },
+  //图片失败，默认图片
+  bind_bnerr2: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "/public/images/empty.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+  },
 });
 \ No newline at end of file
@@ -3,6 +3,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
-    "my_confirm": "/components/my_confirm/my_confirm"
+    "my_confirm": "/components/my_confirm/my_confirm",
+      "qr_code": "/components/qr_code/qr_code"
   }
 }
 \ No newline at end of file
 <view class="box data-v-3a5b7e36">
   <view class="box_top data-v-3a5b7e36">
-    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36">
     <view class="top_title data-v-3a5b7e36">
@@ -40,19 +40,19 @@
       <view class="box_ware_box data-v-3a5b7e36">
         <view class="box_ware_img data-v-3a5b7e36">
           <block wx:if="{{item.lbType==1}}">
-            <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+            <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].wareImage"></image>
           </block>
           <block wx:if="{{item.lbType==2}}">
-            <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+            <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].wareImage"></image>
           </block>
           <block wx:if="{{item.lbType==3}}">
-            <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+            <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].wareImage"></image>
           </block>
           <block wx:if="{{item.lbType==4}}">
-            <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+            <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].wareImage"></image>
           </block>
           <block wx:if="{{item.lbType==5}}">
-            <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+            <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].wareImage"></image>
           </block>
         </view>
         <view class="box_ware_item data-v-3a5b7e36">
@@ -67,16 +67,16 @@
           </view>
           <view class="box_ware_code data-v-3a5b7e36">
             <block wx:if="{{isBuy==0&item.lbType==1}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="__e" class="data-v-3a5b7e36"></image>
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
             </block>
             <block wx:if="{{isBuy==0&item.lbType==2}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}"  class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
             </block> 
             <block wx:if="{{isBuy==0&item.lbType==3}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
             </block>
             <block wx:if="{{isBuy==0&item.lbType>3}}">
-              <text class="data-v-3a5b7e36">已自动到账</text>
+              <text class="data-v-3a5b7e36">奖励已发放</text>
             </block>
           </view>
         </view>
@@ -95,35 +95,37 @@
   <block wx:if="{{isBuy==1}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36">
-          <text bindtap="GetBuyPrice" class="data-v-3a5b7e36" data-id="{{lbId}}">立即购买</text>
+        <view class="foot_button_left data-v-3a5b7e36" data-id="{{lbId}}" bindtap="GetBuyPrice">
+          <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36">
-          <text bindtap="GetBuyIntegral" class="data-v-3a5b7e36" data-id="{{lbId}}">立即兑换</text>
+        <view class="foot_button_right data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+          <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36">
-          <text bindtap="GetBuyPrice" class="data-v-3a5b7e36" data-id="{{lbId}}">立即购买</text>
+        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetBuyPrice" data-id="{{lbId}}">
+          <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36">
-          <text bindtap="GetBuyIntegral" class="data-v-3a5b7e36" data-id="{{lbId}}">立即兑换</text>
+        <view class="foot_button_intalge data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+          <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
     </view>
   </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
-      <view class="foot_button_buy data-v-3a5b7e36">
-        <text bindtap="__e" class="data-v-3a5b7e36">立即使用</text>
+      <view class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+        <text class="data-v-3a5b7e36">立即使用</text>
       </view>
     </view>
   </block>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
-<my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
+<my_confirm id="my_confirm"></my_confirm>
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
 \ No newline at end of file
@@ -18,7 +18,7 @@
 	margin: 10rpx 20rpx 20rpx 20rpx;
 	padding: 35rpx;
 	background-color: #FFFFFF;
-	border-radius: 20rpx;
+	border-radius: 40rpx;
 }
 .top_title.data-v-3a5b7e36 {
 	font-size: 30rpx;
@@ -57,7 +57,7 @@
 	margin: 10rpx 20rpx 20rpx 20rpx;
 	padding: 35rpx;
 	background-color: #FFFFFF;
-	border-radius: 20rpx;
+	border-radius: 40rpx;
 }
 .box_ware_title.data-v-3a5b7e36 {
 	font-size: 35rpx;
@@ -69,14 +69,16 @@
 	display: flex;
 	margin: 10rpx 0rpx 25rpx 0rpx;
 }
-.box_ware_img.data-v-3a5b7e36 {
+/* .box_ware_img.data-v-3a5b7e36 {
 	width: 30%;
 	height: 180rpx;
 	border: #999999 solid 1rpx;
-}
+} */
 .box_ware_img image.data-v-3a5b7e36 {
-	width: 100%;
-	height: 100%;
+	width: 185rpx;
+	height: 190rpx;
+  /* background-color: rgba(138, 138, 138, 0.63); */
+  border: 2rpx solid #999999;
 }
 .box_ware_item.data-v-3a5b7e36 {
 	width: 70%;
@@ -126,7 +128,7 @@
 	margin: 10rpx 20rpx 50rpx 20rpx;
 	padding: 35rpx;
 	background-color: #FFFFFF;
-	border-radius: 20rpx;
+	border-radius: 40rpx;
 }
 .foot_box_title.data-v-3a5b7e36 {
 	font-size: 35rpx;
@@ -162,7 +164,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 30rpx 0rpx 0rpx 30rpx;
+	border-radius: 40rpx;
 }
 .foot_button_right.data-v-3a5b7e36 {
 	background: #ffbb42;
@@ -171,7 +173,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 0rpx 30rpx 30rpx 0rpx;
+	border-radius: 40rpx;
 }
 .foot_button_buy.data-v-3a5b7e36 {
 	background: #e4010c;
@@ -180,7 +182,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 30rpx 30rpx 30rpx 30rpx;
+	border-radius: 40rpx;
 }
 .foot_button_intalge.data-v-3a5b7e36 {
 	background: #ffbb42;
@@ -189,7 +191,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 30rpx 30rpx 30rpx 30rpx;
+	border-radius: 40rpx;
 }
 page.data-v-3a5b7e36 {
   background-color: #e85f93;
@@ -11,8 +11,8 @@ Page({
     getStorageID: '',
     getUserID: '',
     wareCard: [],
-    pages: 0,
-    pageSize: 10,
+    // pages: 0,
+    // pageSize: 10,
     isEmpty: false,
     loadingType: 0, //定义加载方式 0---contentdown  1---contentrefresh 2---contentnomore
     contentText: {
@@ -23,7 +23,7 @@ Page({
     ismore:0,//数据是否全部加载完成
     is_read:0,//是否查询过我的礼包接口
     curpage: 1, //当前分页数
-    pageSize: 3, //页大小
+    pageSize: 10, //页大小
     total: 0, //总数量
   },
@@ -34,8 +34,6 @@ Page({
     th.setData({
       getStorageID: a.stoid,
       getUserID: d.user_id,
-      pages: 1,
-      pageSize: 3,
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
     })
@@ -169,9 +167,7 @@ Page({
   navigateTo: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: url,
-    })
+    getApp().goto(url);
   },
   //下拉事件
   onReachBottom: function () {
@@ -183,5 +179,13 @@ Page({
     })
     th.getList();
   },
+  //图片失败，默认图片
+  bind_bnerr2: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "/public/images/empty.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+
+  },
 });
 \ No newline at end of file
@@ -17,7 +17,7 @@
       <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
-          <image src="{{iurl+item.lbUrl}}" lazy-load="true"></image>
+          <image src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
           <block wx:if="{{item.actType!=0}}">
             <view class="{{[item.actType==1?'content_box_img_title content_box_img_ground1':item.actType==2?'content_box_img_title content_box_img_ground2':item.actType==4?'content_box_img_title content_box_img_ground3':'content_box_img_title content_box_img_ground4']}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift01.png'}}" lazy-load="true"></image>
@@ -42,7 +42,7 @@
         </view>
         <view class="content_box_title">
           <view class="content_ware_title">
-            <text bindtap="__e">{{item.giftTitle}}</text>
+            <text>{{item.giftTitle}}</text>
           </view>
           <view class="content_ware_type">
             <block wx:if="{{item.actType==0&item.payMoney>0}}">
@@ -94,14 +94,11 @@
         <text>当前暂无礼包</text>
       </view>
       <view class="foot_empty_button">
-        <text bindtap="__e">去获取</text>
+        <text bindtap="navigateTo" data-url="/pages/giftpack/buygiftpack/giftpackbuy">去获取</text>
       </view>
     </view>
   </block>
   <block wx:if="{{ismore}}">
-  <!-- <view class="foot_box">
-    <text>———— 到底了 ————</text>
-  </view> -->
     <!-- 加载完毕并且数据大于=页大小 -->
     <view class="After_all flex-center" wx:if="{{ismore && wareCard.length>=3}}">
       <view class="Line"></view>
@@ -236,7 +236,7 @@
 }
 page {
-  background-color: #fb7454;
+  background-color: rgb(250, 120, 88);
 }
 .After_all {
   height: 80rpx;
+var e = getApp();
+var regeneratorRuntime = require('../../../utils/runtime.js');
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: e.globalData.setting.imghost,
+    resourceUrl: e.globalData.setting.resourceUrl,
+    iurl: e.globalData.setting.imghost,
+    order: null,
+    type: 1,
+    allmoney: 0,
+    user_money: 0,
+    order_sn: "",
+    pick: null,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: async function (options) {
+    wx.setNavigationBarTitle({
+      title: '支付成功',
+    });
+
+    var type = options.type, order_sn = options.order_sn;
+    var th = this, order = null;
+    //如果是等1，就是单个订单的订单号
+    if (type == 1) {
+      await getApp().request.promiseGet("/api/weshop/order/page",
+        { data: { store_id: e.globalData.setting.stoid, order_sn: order_sn } }).then(res => {
+          order = res.data.data.pageData[0];
+          th.setData({ order: order, order_sn: order_sn })
+        })
+    } else {
+      await getApp().request.promiseGet("/api/weshop/order/page",
+        { data: { store_id: e.globalData.setting.stoid, parent_sn: order_sn } }).then(res => {
+
+          var allmoney = 0, user_money = 0;
+          for (var i in res.data.data.pageData) {
+            var item = res.data.data.pageData[i];
+            allmoney += item.order_amount;
+            user_money += item.user_money ? item.user_money : 0;
+          }
+          order = res.data.data.pageData[0];
+          th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money })
+        })
+    }
+    //--获取门店--
+    if (order.exp_type == 1) {
+      await getApp().request.promiseGet("/api/weshop/pickup/get/" + e.globalData.setting.stoid + "/" + order.pickup_id,
+        { 1: 1 }).then(res => {
+          th.setData({ pick: res.data.data })
+        });
+    }
+  },
+
+  goto: function () {
+    var url = '/pages/index/index/index';
+    getApp().goto(url)
+  },
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "支付成功",
+  "usingComponents": {}
+}
 \ No newline at end of file
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<view>
+  <!-- 支付成功提示 -->
+  <view class="payradio">
+    <!-- 提示框 -->
+    <view class="Success_box flex-center">
+      <view>
+        <view class="flex-center">
+          <image src="{{url}}miniapp/images/pay/paysuccess.png"></image>
+        </view>
+        <view class="Success_box_title fs32">订单支付成功!</view>
+      </view>
+    </view>
+
+    <!-- 支付信息 -->
+    <view class="payitem_max fs28">
+      <!-- 订单编号 -->
+      <view class="payitem flex">
+        <view>订单编号 :</view>
+        <text selectable="true">{{order_sn}}</text>
+      </view>
+
+      <!-- 实付金额 -->
+
+      <view class="payitem flex">
+        <view>实付金额 :</view>
+        <!-- {{filters.toFix()}} -->
+        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
+        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="payitem flex" wx:if="type==1">
+        <view>支付方式 :</view>
+        <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
+        <view wx:elif="{{order.order_amount>0}}">微信支付</view>
+        <view wx:elif="{{order.user_money>0}}">余额支付</view>
+        <view wx:else>免单</view>
+      </view>
+      <view class="payitem flex"  wx:else>
+          <view>支付方式 :</view>
+          <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
+          <view wx:elif="{{allmoney>0}}">微信支付</view>
+          <view wx:elif="{{user_money>0}}">余额支付</view>
+          <view wx:else>免单</view>
+      </view>
+
+
+
+    </view>
+  </view>
+  <view class="flex-level">
+    <view class="line"></view>
+  </view>
+
+  <!-- 跳转链接 -->
+  <view>
+
+    <!-- 链接 -->
+    <view class="fs32">
+      <view class="flex-center">
+        <navigator class="pay_order flex-center" url="/pages/giftpack/mygiftpack/mygiftpack">
+          <view>我的礼包</view>
+        </navigator>
+      </view>
+      <view class="flex-center">
+        <navigator class="pay_home flex-center" bindtap="goto">
+          <view>回到首页</view>
+        </navigator>
+      </view>
+    </view>
+  </view>
+</view>
 \ No newline at end of file
+page {
+  border-top: 2rpx solid rgb(245, 245, 245);
+}
+.line {
+  border-top: 2rpx solid rgb(245, 245, 245);
+  width: 700rpx;
+}
+
+.payradio .Success_box {
+  padding-top: 45rpx;
+  padding-bottom: 45rpx;
+}
+
+.payradio .Success_box .Success_box_title {
+  margin-top: 45rpx;
+  color: rgb(8, 8, 8);
+}
+
+.payradio image {
+  width: 140rpx;
+  height: 140rpx;
+  display: flex;
+}
+
+.payitem_max {
+  padding: 0rpx 55rpx;
+  color: rgb(104, 104, 104);
+  padding-bottom: 30rpx;
+}
+
+.payitem_max .payitem {
+  margin-top: 30rpx;
+}
+
+.payitem_max .payitem .pay_nam {
+  width: 200rpx;
+}
+
+.payitem_max .payitem view {
+  margin-right: 50rpx;
+}
+.pay_money{
+  color: rgb(219, 27, 52);
+}
+
+.pay_User {
+  padding-left: 55rpx;
+  color: rgb(104, 104, 104);
+}
+
+.pay_User .payitem {
+  margin-top: 30rpx;
+}
+
+.pay_User .payitem .pay_Receiving {
+  width: 128rpx;
+  margin-right: 50rpx;
+}
+
+.pay_User .payitem .pay_name {
+  margin-right: 38rpx;
+  max-width: 250rpx;
+}
+
+.pay_order {
+  margin-top: 115rpx;
+  color: rgb(104, 104, 104);
+  width: 560rpx;
+  height: 62rpx;
+  border-radius: 30rpx;
+  border: 3rpx solid rgb(209, 209, 209);
+}
+
+.pay_home {
+  margin-top: 35rpx;
+  color: rgb(255, 255, 255);
+  width: 566rpx;
+  height: 68rpx;
+  border-radius: 30rpx;
+  background-color: rgb(219, 27, 52);
+}
+.address{
+  width: 470rpx;
+}
 \ No newline at end of file
@@ -31,17 +31,15 @@ Page({
        full_cz_val:0,
        is_dengji:0,   //是不是等级
   },
-  goto_service: function () {
+  goto_nav: function (e) {
     var th = this;
+    var url = e.currentTarget.dataset.url;
     if (th.data.userInfo != null) {
-      var url = "/pages/user/my_service/i_service";
       getApp().goto(url);
     } else {
-      if(th.data.is_nav){
         wx.navigateTo({
           url: '/pages/getphone/getphone',
         })
-      }
     }
   },
   /**
@@ -212,12 +212,12 @@
           <image class="xc-center-img " src="{{iurl}}/miniapp/images/add2.png"></image>
           <view class="four-level-word">我的地址</view>
         </view>
-        <view class="item t-c" data-url="/pages/user/my_service/i_service" bindtap="goto_service" >
+        <view class="item t-c" data-url="/pages/user/my_service/i_service" bindtap="goto_nav" >
 					<image class="xc-center-img " src="{{iurl}}/miniapp/images/yyservice/myservice.png"></image>
 					<view class="four-level-word">我的服务</view>
 				</view>
-        <view class="item t-c" data-url="/pages/giftpack/mygiftpack/mygiftpack" bindtap="goto">
-					<image class="xc-center-img " src="{{iurl}}/miniapp/images/yyservice/myservice.png"></image>
+        <view class="item t-c" data-url="/pages/giftpack/mygiftpack/mygiftpack" bindtap="goto_nav">
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images/user/wdlb.png"></image>
 					<view class="four-level-word">我的礼包</view>
 				</view>
       </view>