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

# Conflicts:
#	pages/luckDraw/profile.wxml

pages/luckDraw/detail.wxss

@@ -109,11 +109,12 @@ page {
     width: 178rpx;
     height: 38rpx;
     border-radius: 30rpx;
-    background: #FF7A95;
-    color: #fff;
+    background: #E9C597;
+    color: #B01717;
     font-size: 24rpx;
     text-align: center;
     margin: 20rpx auto;
+    font-weight: 600;
 }
 
 .luck-draw-gifts {

pages/luckDraw/profile.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "个人中心",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "tab-bar": "./components/tabbar",
     "topbar": "../../components/topbar",

pages/luckDraw/recordPrize.wxml

@@ -1,22 +1,28 @@
 <!--pages/luckDraw/recordPrize.wxml-->
 <view class="personal">
-<!-- 中奖记录 -->
-    <view class="luck-draw-theme" catchtap="turnPrize">
-      <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" >请登录</button>
-      <!-- 奖品 -->
-      <view class="luck-draw-content" wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}">
-        <view class="luck-draw-words">
-          <view class="luck-draw-discount1">
-            
-            <image class="luck-draw-zkz5" src="{{item.fullGoodsSmallImage}}" />
-          </view>
-          <view class="luck-draw-discount2">
-            <view class="luck-draw-zkz1">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
-            <view class="luck-draw-zkz3">{{item.createTime}}</view>
+  <!-- 中奖记录 -->
+  <view class="luck-draw-theme" catchtap="turnPrize">
+    <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">请登录</button>
+    <!-- 奖品 -->
+    <view class="luck-draw-content" wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}">
+      <view class="luck-draw-words">
+        <view class="luck-draw-discount1">
+
+          <image class="luck-draw-zkz5" src="{{item.fullGoodsSmallImage}}" />
+        </view>
+        <view class="luck-draw-discount2">
+          <view class="luck-draw-zkz1">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
+          <view class="luck-draw-zkz3">{{item.createTime}}</view>
+        </view>
+        <view class="coupon-jump" wx:if="{{item.isHit == 1}}">
+          <view class="coupon-right-usenow2">
+            <navigator class="btn_exchange" target="miniProgram" app-id="wxd92a2d29f8022f40" path="page/index/index" open-type='navigate'>
+            </navigator>
           </view>
         </view>
+      </view>
 
-        <!-- <view class="luck-draw-words1" wx:if="{{item.isHit != 1}}">
+      <!-- <view class="luck-draw-words1" wx:if="{{item.isHit != 1}}">
           <view class="luck-draw-discount12">
             
             <image class="luck-draw-zkz52" src="{{item.fullGoodsSmallImage}}" />
@@ -26,14 +32,12 @@
             <view class="luck-draw-zkz3">{{item.createTime}}</view>
           </view>
         </view> -->
-      </view>
-      <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂无抽奖记录 ————</view>
-      <view class="no_result" wx:if="{{noMore}}">———— 更多抽奖 | 敬请期待 ————</view>
     </view>
+    <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂无抽奖记录 ————</view>
+    <view class="no_result" wx:if="{{noMore}}">———— 更多抽奖 | 敬请期待 ————</view>
+  </view>
 </view>
 
 
 <!-- 底部导航 -->
-<!-- <tab-bar /> -->
-
-
+<!-- <tab-bar /> -->

pages/luckDraw/recordPrize.wxss

@@ -110,7 +110,7 @@
 }
 
 .luck-draw-discount2{
-  width: 500rpx;
+  width: 300rpx;
   height: 100%;
 }
 
@@ -176,4 +176,22 @@
   text-align: center;
   line-height: 100rpx;
   font-weight: 1000;
+}
+
+.coupon-jump{
+  width: 200rpx;
+  height: 190rpx;
+}
+
+.coupon-right-usenow2{
+  width: 162rpx;
+  height: 56rpx;
+  background-image: url(https://dy.shpr.top/luckDraw/coupon_use_now.png);
+  background-size: 100% 100%;
+  margin-top: 35%;
+}
+
+.btn_exchange{
+  width: 100%;
+  height: 100%;
 }

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.wxml

@@ -40,8 +40,8 @@
     <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_text"><text class="hsay_text">沪上阿姨有您更优秀<br />
+            研发团队正在拼命优化中</text></view>
         <view class="w_border"></view>
         <view class="w_go_order" bindtap="goPerson">我知道了</view>
       </view>

pages/welfareMall/feedback/feedback.wxss

@@ -35,28 +35,30 @@ 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;
+  width: 660rpx;
   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 +139,7 @@ textarea{
   height: 30rpx;
   font-size: 28rpx;
   font-weight: 600;
-  color: #444444;
+  color: #e0dada;
 }
 
 .bg-zindex{