Merge remote-tracking branch 'origin/master' into pre

pages/welfareMall/order/orderCompletion.js

@@ -24,13 +24,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var that = this;
-    that.orderSn = options.ordersn
+    // var that = this;
+    // that.orderSn = options.ordersn
+    if(!options.ordersn){
+      return;
+    }
     this.setData({
       orderSn: options.ordersn,
     })
-      this.getOrder(that.orderSn);
-      this.data.orderSn = options.ordersn;
+      this.getOrder(options.ordersn);
+      // this.data.orderSn = options.ordersn;
   },
 
   
@@ -58,10 +61,12 @@ Page({
    * 订单数据--查询
    */
   selectOrder: async function(orderSn) {
+   
     let res = await WelfareMall.getOrder({
       mobile: getMobileCache(),
       orderSn: orderSn,
     })
+    this.userOrderistView(res.data)
     await this.changeOrder(res.data.orderSn,res.data.status.value,res.data.status.showText);
   },
 
@@ -241,9 +246,10 @@ Page({
       orderSn: that.data.orderSn,
       reason: reason,
     });
-    await that.cancel();
-    // await that.onLoad(that.options);
+     that.cancel();
+
     await that.selectOrder(that.data.orderSn);
+   
     // await wx.navigateTo({
     //   url:  "../refund/refund?orderSn=" + that.data.orderSn
     // })

pages/welfareMall/personal/personal.wxml

@@ -46,7 +46,13 @@
         </view>
       </view>
     </view>
+
+
   </custom-page>
+
+  <view>
+  <button open-type="contact" class="call" type="warn" size="mini">联系我们</button>
+</view>
 </page-wrap>
 
 <!-- 使用wxs 手机号码中间四位显示为*号 -->

pages/welfareMall/personal/personal.wxss

@@ -235,3 +235,22 @@ page{
   filter: grayscale(100%);
 }
 
+.call{
+  position: fixed;
+  width: 50px!important;
+  height: 50px!important;
+  border-radius: 25px!important;
+  right: 0px!important;
+  bottom: 30px!important;
+  font-size: 10px!important;
+  background-color: #B01717!important;
+  color: #fff!important;
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: center;
+  align-items: center;
+  padding: 0px!important;
+  line-height: 50px!important;
+  z-index: 9999;
+}
+