feat(福利Go)卡券中心 修改样式

pages/welfareMall/activityInfo/activityInfo.wxml

@@ -1,6 +1,7 @@
 
 <image src="{{detail.fullCoverImg}}" mode="widthFix" class="top_img"></image>
 
+<view class="info_all flex-row">
 <view class="flex-row info">
   <view class="info_left flex-column">
     <view class="info_name over-ellipsis">{{detail.name}}</view>
@@ -34,7 +35,7 @@
   <view class="info_right_bottom">价值￥{{detail.showPriceFormatter}}</view>
   </view>
 </view>
-
+</view>
 <view  class="bottom_title flex-column">
 <view class="flex-row bottom_title_top">
 <image src="/images/welfareMall/bag_content.png" class="bottom_icon"></image>

pages/welfareMall/activityInfo/activityInfo.wxss

@@ -20,7 +20,7 @@ Page {
   width: 690rpx;
   height: 236rpx;
   justify-content: space-between!important;
-  margin-top: 25px;
+
 }
 .info_left{
   width: 486rpx;
@@ -52,7 +52,7 @@ Page {
   font-size: 12px;
   font-weight: 400;
   color: #A0A0A0;
-  margin-right: 2px;
+  margin-right: 4px;
 }
 .right_icon{
   width: 13px;
@@ -204,4 +204,16 @@ margin-top:30px;
   width: 21px;
   height: 21px;
   margin-top:24px;
+}
+.info_all{
+  width: 750rpx;
+   height: 286rpx;
+   margin-top: -25px;
+   background-color: #FFFFFF;
+   justify-content: center!important;
+   border-top-left-radius: 20px;
+   border-top-right-radius: 20px;
+    align-items: flex-end;
+   z-index: 999;
+   border-top:solid 1px #E8e8e8;
 }

pages/welfareMall/activityList/activityList.js

@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-      type:1, //1免费 2 收费
+      type:2, //1免费 2 收费
       page:1,
       pageSize:10,
       list:[],
@@ -20,7 +20,7 @@ Page({
    */
   onLoad: function (options) {
     this.data.page = 1;
-    this.data.type = 1;
+    this.data.type = 2;
     this.getActivityList()
   },
 

pages/welfareMall/activityList/activityList.wxml

@@ -1,14 +1,15 @@
 <view class="top_banner flex-row">
-  <view class="top_banner_item flex-column" bindtap="gotoFree">
-    <view class="t_b_i_title">免费券包</view>
-    <view class="t_b_i_border {{type==1?'active':''}}"></view>
-  </view>
 
   <view class="top_banner_item flex-column" bindtap="gotoPay">
     <view class="t_b_i_title">特惠券包</view>
     <view class="t_b_i_border {{type==2?'active':''}}"></view>
   </view>
-  
+
+  <view class="top_banner_item flex-column" bindtap="gotoFree">
+    <view class="t_b_i_title">免费券包</view>
+    <view class="t_b_i_border {{type==1?'active':''}}"></view>
+  </view>
+
 </view>
 
 

pages/welfareMall/activityList/activityList.wxss

@@ -9,8 +9,8 @@ Page {
   background-color: #F7F7F7;
 }
 .top_banner{
-  width: 375px;
-  height: 49px;
+  width: 750rpx;
+  height: 98rpx;
   background: #FFFFFF;
   justify-content: space-around!important;
   align-items: flex-end!important;
@@ -36,25 +36,23 @@ Page {
   border-radius: 1px;
 }
 
-
-
 .coupon_item{
-  height: 119px;
-  width: 358px;
-  margin-top: 12px;
+  height: 238rpx;
+  width: 716rpx;
+  margin-top: 24rpx;
   background-color: #FFFFFF;
-  border-radius: 5px;
+  border-radius: 10rpx;
 }
 
 .coupon_item_img{
-  width: 120px;
+  width: 240rpx;
   height: 91px;
   border-radius: 5px;
   margin-left: 13px;
 }
 .coupon_item_right{
-  width: 200px;
-  height: 91px;
+  width: 398rpx;
+  height: 182rpx;
   margin-left: 13px;
   box-sizing: border-box;
   padding-top: 5px;

pages/welfareMall/index/index.wxss

@@ -64,7 +64,7 @@ Page {
   border-radius: 10rpx;
   margin-top: 26rpx;
   box-sizing: border-box;
-  padding: 40rpx 34rpx;
+  padding: 40rpx 36rpx;
   margin-bottom: 40rpx;
 }
 .c_l_top{
@@ -92,18 +92,19 @@ color: #A0A0A0;
 text-align: right;
 }
 .coupon_item{
-  height: 91px;
-  margin-top: 18px;
+  height: 182rpx;
+  margin-top: 36rpx;
+  width: 640rpx;
 }
 .coupon_item_img{
-  width: 112px;
-  height: 91px;
-  border-radius: 5px;
+  width: 224rpx;
+  height: 182rpx;
+  border-radius: 10rpx;
 }
 .coupon_item_right{
-  width: 174px;
-  height: 91px;
-  margin-left: 17px;
+  width: 344rpx;
+  height: 182rpx;
+  margin-left: 36rpx;
   box-sizing: border-box;
   padding-top: 5px;
   justify-content: space-between!important;

pages/welfareMall/personal/personal.wxss

@@ -75,7 +75,7 @@
 .head-card{
   width: 666rpx;
   height: 286rpx;
-  background-image: url(https://dy.shpr.top/shareActivity/card.png);
+  background-image: url(https://dy.shpr.top/welfareGo/card.png);
   background-size: 100% 100%;
   margin-bottom: 51rpx;
   justify-content: space-between;

project.config.json

@@ -4,7 +4,7 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
     "enhance": true,
     "postcss": false,

utils/request.js

@@ -4,9 +4,9 @@ class request {
     //本地的
 //    static BASE_URL = 'http://localhost:8014/'
 //   pre环境的
-  static BASE_URL = 'https://oapi.shpr.top/'
+//   static BASE_URL = 'https://oapi.shpr.top/'
 //   正式的
-//   static BASE_URL = 'https://vapi.hsayi.com/'
+  static BASE_URL = 'https://vapi.hsayi.com/'
 //   @todo需要修改正式的域名
 
   static HEAD = {