Merge branch 'skk/feat/welfare-mall' into jeffrey/feat/coupon-center

pages/welfareMall/feedback/feedback.js

@@ -14,6 +14,7 @@ Page({
     chooseViewShowBanner: true,
     content: '',
     basePath: '',
+    hideWindowValue: false,
   },
 
   bindText: function (e) {
@@ -158,42 +159,33 @@ Page({
       content: this.data.content,
     }).then(res => {
         if (res.code == 200) {
-          this.getModal()
+          this.hideWindow()
         }
     }).catch(_ => {
         console.log(_)
     })
   },
 
-  getModal() {
-    wx.showModal({
-      title: '非常感谢您的反馈',
-      content: '沪上阿姨有您更优秀 研发团队正在拼命优化中',
-      showCancel: false,//是否显示取消按钮
-      cancelText:"否",//默认是“取消”
-      cancelColor:'skyblue',//取消文字的颜色
-      confirmText:"我知道了",//默认是“确定”
-      confirmColor: 'black',//确定文字的颜色
-      success: res => {if (res.cancel) {
-          wx.switchTab({
-            url: "../personal/personal"
-          })
-        } else {
-            //点击确定 
-            wx.switchTab({
-              url: "../personal/personal"
-            })
-        }
-      },
-      fail: function (res) { },//接口调用失败的回调函数 
+  /**
+   * 弹框
+   */
+  hideWindow(){
+    this.setData({
+      hideWindowValue:true
     })
-},
+  },
+
+  goPerson(){
+    wx.switchTab({
+         url: '../personal/personal'
+     })
+  },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    
   },
 
   /**

pages/welfareMall/feedback/feedback.wxml

@@ -36,5 +36,15 @@
         <view class="lower-order-text">提交</view>
       </view>
     </view>
+    <!-- 弹框 -->
+    <view class="bg-zindex" wx:if="{{hideWindowValue}}">
+      <view class="success_window flex-column">
+        <view class="w_title">非常感谢您的反馈</view>
+        <view class="w_text"><text class="hsay_text">沪上阿姨有您更优秀<br/>
+        研发团队正在拼命优化中</text></view>
+        <view class="w_border"></view>
+        <view class="w_go_order" bindtap="goPerson">我知道了</view>
+      </view>
+    </view>
   </view>
 </view>

pages/welfareMall/feedback/feedback.wxss

@@ -138,4 +138,57 @@ textarea{
   font-size: 28rpx;
   font-weight: 600;
   color: #444444;
+}
+
+.bg-zindex{
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  background: #3E3E3E;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  z-index: 999;
+}
+.success_window{
+  width: 328px;
+  height: 227px;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  position: relative;
+  z-index: 9999;
+  align-items: center;
+}
+
+.w_title{
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #444444;
+  margin-top: 27px;
+}
+
+.w_text{
+  margin-top: 32px;
+  text-align: center;
+}
+
+.hsay_text{
+  margin-top: 8px;
+  font-size: 12px;
+  font-weight: 500;
+  color: #444444;
+}
+.w_border{
+  width: 300px;
+  height: 1px;
+  background: #A0A0A0;
+  margin-top: 36px;
+}
+.w_go_order{
+  font-size: 18px;
+  font-weight: 500;
+  color: #444444;
+  margin-top: 32rpx;
 }