Merge remote-tracking branch 'origin/jeffrey/feat/coupon-center' into jeffrey/feat/coupon-center

pages/welfareMall/coupon/coupon.wxml

@@ -1,6 +1,6 @@
 <!--pages/welfareMall/coupon/coupon.wxml-->
     <!-- 内容 -->
-    <view  class="{{item.couponType == 'C'?'coupon-list2 flex-row':'coupon-list flex-row'}}" wx:for="{{couponList}}" wx:key="index" data-couponSn="{{item.couponSn}}">
+    <navigator  class="{{item.couponType == 'C'?'coupon-list2 flex-row':'coupon-list flex-row'}}" wx:for="{{couponList}}" wx:key="index" data-couponSn="{{item.couponSn}}" target="miniProgram" app-id="wxd92a2d29f8022f40" path="page/index/index" open-type='navigate'>
         <view class="coupon-info flex-column">
           <viwe class="coupon-info-tittle">{{item.couponTitle}}</viwe>
           <view class="coupon-center-bm flex-row">
@@ -21,8 +21,8 @@
             <view class="{{item.formatReduceCost.length > 3 ?'coupon-num-numSmall':'coupon-num-num'}}" wx:if="{{item.couponType == 'C'}}">{{item.formatReduceCost ?item.formatReduceCost:0}}</view>
           </view>
           <!-- <jumpmallapp>去使用</jumpmallapp> -->
-          <jumpmallapp class="coupon-num-text">立即使用</jumpmallapp>
+          <view class="coupon-num-text">立即使用</view>
         </view>
-    </view>
+    </navigator>
     <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂可用优惠券 ————</view>
     <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>

pages/welfareMall/feedback/feedback.wxss

@@ -35,28 +35,29 @@ page{
   color: #444444;
 }
 
-textarea{
-  width: 659rpx;
-  height: 320rpx;
+.feedback-text{
   background: #FFFFFF;
   border: 1px solid #EFEFEF;
   border-radius: 10rpx;
-  z-index: 1;
+}
+
+textarea{
+  width: 660rpx;
+  height: 280rpx;
+  border-bottom: 0;
   padding-left: 33rpx;
   padding-top: 42rpx;
 }
 
 .suggest_text-count{
-  width: 659rpx;
-  height: 40rpx;
   justify-content: flex-end;
-  margin-right: 28rpx;
+  padding-right: 28rpx;
 }
 
 .suggest_text-num{
   z-index: 2;
   font-size: 26rpx;
-  margin-bottom: 86rpx;
+  /* margin-bottom: 86rpx; */
 }
 
 .feedback-exp{
@@ -137,7 +138,7 @@ textarea{
   height: 30rpx;
   font-size: 28rpx;
   font-weight: 600;
-  color: #444444;
+  color: #e0dada;
 }
 
 .bg-zindex{