feat(添加退款说明和使用说明)

app.json

@@ -27,7 +27,9 @@
         "pages/welfareMall/staff/noStaff",
         "pages/welfareMall/staffManage/staffManage",
         "pages/welfareMall/couponFitStore/index",
-        "pages/welfareMall/couponFitFood/index"
+        "pages/welfareMall/couponFitFood/index",
+        "pages/welfareMall/refundInfo/refundInfo",
+        "pages/welfareMall/buyInfo/buyInfo"
     ],
     "window": {
         "backgroundTextStyle": "light",

pages/welfareMall/activityList/activityList.js

@@ -13,7 +13,8 @@ Page({
       pageSize:10,
       list:[],
       init:true,
-      config:{}
+      config:{},
+      noResult:false
   },
 
   /**
@@ -86,7 +87,7 @@ Page({
       type:1,
       page:1,
       noMore: false,
-     
+      noResult:false,
     })
     this.getActivityList();
   },
@@ -95,7 +96,7 @@ Page({
       type:2,
       page:1,
       noMore: false,
-    
+      noResult:false,
     })
     this.getActivityList();
   },
@@ -115,7 +116,7 @@ Page({
       this.setData({
         init: init,
         noMore: this.data.page == 1 ? false: true,
-        
+        noResult:this.data.page == 1 ? true: false,
       })
     }
 

pages/welfareMall/buyInfo/buyInfo.js

@@ -0,0 +1,66 @@
+// pages/welfareMall/buyInfo/buyInfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/welfareMall/buyInfo/buyInfo.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "使用说明"
+}

pages/welfareMall/buyInfo/buyInfo.wxml

@@ -0,0 +1,3 @@
+
+<image src="https://dy.shpr.top/welfareGo/buyInfo1.png" mode="widthFix"></image>
+<image src="https://dy.shpr.top/welfareGo/buyInfo2.png" mode="widthFix" style="margin-bottom: 150rpx;"></image>

pages/welfareMall/buyInfo/buyInfo.wxss

@@ -0,0 +1 @@
+/* pages/welfareMall/buyInfo/buyInfo.wxss */

pages/welfareMall/feedback/feedback.js

@@ -188,7 +188,16 @@ Page({
       config:res.data.config
     })
   },
-
+  goToRefund (){
+    wx.navigateTo({
+      url: '/pages/welfareMall/refundInfo/refundInfo'
+    })
+  },
+  goToBuy(){
+    wx.navigateTo({
+      url: '/pages/welfareMall/buyInfo/buyInfo'
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/welfareMall/feedback/feedback.wxml

@@ -38,6 +38,19 @@
     </view>
 
     <view>
+
+    <view class="info-title">温馨提示</view>
+      <view class="info-view flex-row" bindtap="goToRefund">
+        <image src="/images/zytx.png" class="zytx"></image>
+        <view class="refund-info">关于如何去退款>></view>
+      </view>
+      <view class="info-view flex-row" bindtap="goToBuy">
+        <image src="/images/zytx.png" class="zytx"></image>
+        <view class="refund-info">关于如何使用券>></view>
+      </view>
+    </view>
+
+    <view>
       <button open-type="contact" class="call" type="warn" size="mini">
         <image class="service-style" src="../../../images/welfareMall/service-img.png"></image>
       </button>

pages/welfareMall/feedback/feedback.wxss

@@ -212,10 +212,37 @@ textarea{
   align-items: center;
   padding: 0px!important;
   line-height: 50px!important;
-  z-index: 9999;
+  z-index: 999;
 }
 
 .service-style{
   width: 62rpx;
   height: 62rpx;
+}
+
+.info-title{
+  width: 630rpx;
+  height: 40rpx;
+  font-size: 30rpx;
+  font-weight: 800;
+  text-align: LEFT;
+  color: #444444;
+  line-height: 40rpx;
+  margin-top: 60rpx;
+}
+.info-view{
+  width: 630rpx;
+  height: 40rpx;
+  margin-top: 30rpx;
+  font-size: 26rpx;
+  font-weight: 600;
+  justify-content: left!important;
+}
+.zytx{
+  width: 40rpx;
+  height: 40rpx;
+}
+.refund-info{
+  margin-left: 19rpx;
+  text-decoration: underline;
 }

pages/welfareMall/refundInfo/refundInfo.js

@@ -0,0 +1,68 @@
+// pages/welfareMall/refundInfo/refundInfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+  goToOrder(){
+    
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/welfareMall/refundInfo/refundInfo.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "退款说明"
+}

pages/welfareMall/refundInfo/refundInfo.wxml

@@ -0,0 +1,9 @@
+<image src="https://dy.shpr.top/welfareGo/refundInfo.png" mode="widthFix"></image>
+
+
+<!-- <view class=" refund-view flex-row"> 
+  <view class="refund" bindtap="goToOrder">
+  历史订单
+</view>
+</view> -->
+

pages/welfareMall/refundInfo/refundInfo.wxss

@@ -0,0 +1,17 @@
+/* pages/welfareMall/refundInfo/refundInfo.wxss */
+
+.refund{
+  width: 630rpx;
+  height: 96rpx;
+  background-color: #EA443A;
+  border-radius: 50rpx;
+  text-align: center;
+  line-height: 96rpx;
+  color: #ffffff;
+}
+
+.refund-view{
+  width: 750rpx;
+  justify-content: center!important;
+  margin-bottom: 100rpx;
+}

project.private.config.json

@@ -1,174 +1,192 @@
 {
-    "setting": {},
-    "condition": {
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "pages/activityInfo/activityInfo",
-                    "pathName": "pages/activityInfo/activityInfo",
-                    "query": "id=Bg5740r78w&mobile=18636653274",
-                    "scene": null
-                },
-                {
-                    "name": "pages/couponReceive/couponReceive",
-                    "pathName": "pages/couponReceive/couponReceive",
-                    "query": "codeId=JyZmVzKm0D-47",
-                    "scene": null
-                },
-                {
-                    "name": "pages/myCoupons/myCoupons",
-                    "pathName": "pages/myCoupons/myCoupons",
-                    "query": "mobile=18636653274",
-                    "scene": null
-                },
-                {
-                    "name": "pages/receiveCoupon/receiveCoupon",
-                    "pathName": "pages/receiveCoupon/receiveCoupon",
-                    "query": "",
-                    "scene": 1013
-                },
-                {
-                    "name": "pages/welfareMall/personal/personal",
-                    "pathName": "pages/welfareMall/personal/personal",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/welfareMall/historical/historical",
-                    "pathName": "pages/welfareMall/historical/historical",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/welfareMall/refund/refund",
-                    "pathName": "pages/welfareMall/refund/refund",
-                    "query": "id=undefined",
-                    "scene": null
-                },
-                {
-                    "name": "福利go ",
-                    "pathName": "pages/welfareMall/index/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "超值券包",
-                    "pathName": "pages/welfareMall/activityList/activityList",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "券包详情",
-                    "pathName": "pages/welfareMall/activityInfo/activityInfo",
-                    "query": "activityId=dl5v9NpmWQ",
-                    "scene": null
-                },
-                {
-                    "name": "pages/luckDraw/detail",
-                    "pathName": "pages/luckDraw/detail",
-                    "query": "id=8",
-                    "scene": null
-                },
-                {
-                    "name": "pages/luckDraw/index",
-                    "pathName": "pages/luckDraw/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/luckDraw/profile",
-                    "pathName": "pages/luckDraw/profile",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/signIn/activity/activity",
-                    "pathName": "pages/signIn/activity/activity",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/signIn/record/record",
-                    "pathName": "pages/signIn/record/record",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/signIn/activity/activity",
-                    "pathName": "pages/signIn/activity/activity",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/signIn/activity/activity",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/activityInfo/activityInfo",
-                    "query": "activityId=0zVqEyWqDn",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/order/orderCompletion",
-                    "query": "ordersn=640950757739862",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/order/orderCompletion",
-                    "query": "ordersn=640940250652495",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/order/orderCompletion",
-                    "query": "ordersn=640230958639293",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/coupon/coupon",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/couponFitStore/index",
-                    "query": "couponId=1PmexHzevy-1300",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/welfareMall/couponFitFood/index",
-                    "query": "couponId=1PmexHzevy-1300&couponName=9%E6%8A%98%E5%88%B8",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/signIn/record/record",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/luckDraw/profile",
-                    "query": "",
-                    "scene": null
-                }
-            ]
+  "setting": {},
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pages/activityInfo/activityInfo",
+          "pathName": "pages/activityInfo/activityInfo",
+          "query": "id=Bg5740r78w&mobile=18636653274",
+          "scene": null
+        },
+        {
+          "name": "pages/couponReceive/couponReceive",
+          "pathName": "pages/couponReceive/couponReceive",
+          "query": "codeId=JyZmVzKm0D-47",
+          "scene": null
+        },
+        {
+          "name": "pages/myCoupons/myCoupons",
+          "pathName": "pages/myCoupons/myCoupons",
+          "query": "mobile=18636653274",
+          "scene": null
+        },
+        {
+          "name": "pages/receiveCoupon/receiveCoupon",
+          "pathName": "pages/receiveCoupon/receiveCoupon",
+          "query": "",
+          "scene": 1013
+        },
+        {
+          "name": "pages/welfareMall/personal/personal",
+          "pathName": "pages/welfareMall/personal/personal",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/welfareMall/historical/historical",
+          "pathName": "pages/welfareMall/historical/historical",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/welfareMall/refund/refund",
+          "pathName": "pages/welfareMall/refund/refund",
+          "query": "id=undefined",
+          "scene": null
+        },
+        {
+          "name": "福利go ",
+          "pathName": "pages/welfareMall/index/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "超值券包",
+          "pathName": "pages/welfareMall/activityList/activityList",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "券包详情",
+          "pathName": "pages/welfareMall/activityInfo/activityInfo",
+          "query": "activityId=dl5v9NpmWQ",
+          "scene": null
+        },
+        {
+          "name": "pages/luckDraw/detail",
+          "pathName": "pages/luckDraw/detail",
+          "query": "id=8",
+          "scene": null
+        },
+        {
+          "name": "pages/luckDraw/index",
+          "pathName": "pages/luckDraw/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/luckDraw/profile",
+          "pathName": "pages/luckDraw/profile",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/signIn/activity/activity",
+          "pathName": "pages/signIn/activity/activity",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/signIn/record/record",
+          "pathName": "pages/signIn/record/record",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/signIn/activity/activity",
+          "pathName": "pages/signIn/activity/activity",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/signIn/activity/activity",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/activityInfo/activityInfo",
+          "query": "activityId=0zVqEyWqDn",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/order/orderCompletion",
+          "query": "ordersn=640950757739862",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/order/orderCompletion",
+          "query": "ordersn=640940250652495",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/order/orderCompletion",
+          "query": "ordersn=640230958639293",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/coupon/coupon",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/couponFitStore/index",
+          "query": "couponId=1PmexHzevy-1300",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/couponFitFood/index",
+          "query": "couponId=1PmexHzevy-1300&couponName=9%E6%8A%98%E5%88%B8",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/signIn/record/record",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/luckDraw/profile",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/feedback/feedback",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/refundInfo/refundInfo",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/welfareMall/buyInfo/buyInfo",
+          "query": "",
+          "scene": null
         }
+      ]
     }
+  }
 }