海报分享方式替换、发布历史改为我的海报,会员开通页面协议优化展示优化、会员开通添加版本对比

packagecard/marketing/marketingposter.js

@@ -15,7 +15,7 @@ Page({
         tabList: [{
             name: '营销模板',
         }, {
-            name: '发布历史'
+            name: '我的海报'
         }],
         isRefreshing: false, //是否刷新中
         isLoadMore: false, //是否在加载中
@@ -176,12 +176,12 @@ Page({
         })
         var type = res.target.dataset.sharetype
         var img = _self.data.imgUrl + _self.data.posterHistoryList[_self.data.curItemIndex].cardTemplateUsePhotoUrl
-
+        var id = _self.data.posterHistoryList[_self.data.curItemIndex].cardTemplateUseId
         if (type && type == '2') {
             //转发个人动态
 
         } else {
-            var param = '/pages/index/index?posterId=' + img;
+            var param = '/pages/index/index?cardTemplateUseId=' + id;
             return {
                 title: '活动',
                 path: param,

packagecard/paypage/paypage.js

@@ -36,6 +36,8 @@ Page({
         selTypeIndex: 0, //当前选中的类型列表
         selTypeId: '', //当前选中的类型id
         selType: '', //选中的类型type
+        isShowContrast: false, //是否显示版本对比
+        contrastId: '', //版本对比图片ID
     },
 
     /**
@@ -122,7 +124,8 @@ Page({
         this.setData({
             isShowUseDeal: false, //使用协议
             isShowServiceTreaty: false, //会员服务协议
-            isShowIntimacyTreaty: false //隐私政策
+            isShowIntimacyTreaty: false, //隐私政策
+            isShowContrast: false //版本对比
         })
     },
     //提交支付
@@ -294,5 +297,25 @@ Page({
             .catch(err => {
 
             })
+    },
+    //显示版本对比
+    showContrast() {
+        var _self = this
+        wx.showLoading({
+            title: '加载中...',
+        })
+        app.http.get(app.urls.getVersionContrast, {
+                header: {
+                    token: app.globalData.token
+                }
+            })
+            .then(res => {
+                wx.hideLoading({})
+                _self.setData({
+                    contrastId: app.urls.baseImgUrl + res.data.data,
+                    isShowContrast: true,
+                })
+            })
+            .catch(err => {})
     }
 })

packagecard/paypage/paypage.wxml

@@ -22,6 +22,7 @@
     <view class="code-box">
         <view class="title">邀请码 (选填)</view>
         <input placeholder="请输入邀请码" type="text" class="code-input" bindinput="inputWatch" maxlength="6" />
+        <image src="/images/ic_version_contrast.png" bindtap="showContrast" mode="scaleToFill"></image>
     </view>
     <view class="type-box">
         <block wx:for="{{typeList}}" wx:key="index">
@@ -40,8 +41,7 @@
         </block>
     </view>
 </view>
-
+<view class="foot" style="padding: 15rpx;background-color: #ffffff;">
-<view class="foot" style="padding: 15rpx;">
     <view class="treaty-box">
         <text class="{{isChecked ? 'cuIcon-squarecheck':'cuIcon-square'}} text-gray" style="font-size: 34rpx;"
             bindtap="changeCheck"></text>
@@ -53,21 +53,50 @@
     </view>
     <button class="cu-btn bg-blue" style="width:100%" bindtap="doPay">立即支付</button>
 </view>
+
 <!-- 使用协议 -->
-<van-popup show="{{ isShowUseDeal }}" bind:close="onClose" custom-style="width:90%;height:75%;" round>
+<van-popup show="{{ isShowUseDeal }}" bind:close="onClose"
-    <view class="treaty-content-box">
+    custom-style="width:90%;height:80%;background-color:transparent;">
-        <rich-text class="content" nodes="{{treatyStr}}"></rich-text>
+    <view style="display: flex;flex-direction: column;justify-content: center;align-items: center;height: 100%;"
+        catchtap="onClose">
+        <scroll-view class="treaty-content-box" scroll-y>
+            <rich-text nodes="{{treatyStr}}"></rich-text>
+        </scroll-view>
+        <text class="cuIcon-roundclose" catchtap="onClose"
+            style="font-size: 50rpx;color: #fff;margin-top: 15rpx;"></text>
     </view>
 </van-popup>
 <!-- 会员服务协议 -->
-<van-popup show="{{ isShowServiceTreaty }}" bind:close="onClose" custom-style="width:90%;height:75%;" round>
+<van-popup show="{{ isShowServiceTreaty }}" bind:close="onClose"
-    <view class="treaty-content-box">
+    custom-style="width:90%;height:80%;background-color:transparent;">
-        <rich-text class="content" nodes="{{treatyStr}}"></rich-text>
+    <view style="display: flex;flex-direction: column;justify-content: center;align-items: center;height: 100%;"
+        catchtap="onClose">
+        <scroll-view class="treaty-content-box" scroll-y>
+            <rich-text nodes="{{treatyStr}}"></rich-text>
+        </scroll-view>
+        <text class="cuIcon-roundclose" catchtap="onClose"
+            style="font-size: 50rpx;color: #fff;margin-top: 15rpx;"></text>
     </view>
 </van-popup>
 <!-- 隐私政策 -->
-<van-popup show="{{ isShowIntimacyTreaty }}" bind:close="onClose" custom-style="width:90%;height:75%;" round>
+<van-popup show="{{ isShowIntimacyTreaty }}" bind:close="onClose"
-    <view class="treaty-content-box">
+    custom-style="width:90%;height:80%;background-color:transparent;">
-        <rich-text class="content" nodes="{{treatyStr}}"></rich-text>
+    <view style="display: flex;flex-direction: column;justify-content: center;align-items: center;height: 100%;"
+        catchtap="onClose">
+        <scroll-view class="treaty-content-box" scroll-y>
+            <rich-text nodes="{{treatyStr}}"></rich-text>
+        </scroll-view>
+        <text class="cuIcon-roundclose" catchtap="onClose"
+            style="font-size: 50rpx;color: #fff;margin-top: 15rpx;"></text>
+    </view>
+</van-popup>
+<van-popup show="{{ isShowContrast }}" bind:close="onClose"
+    custom-style="background-color:transparent;height:100%;width:100%;" round>
+    <view bindtap="onClose"
+        style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 80rpx;">
+        <image src="{{contrastId}}" mode="widthFix" style="width: 80%;max-height: 70%;border-radius: 10rpx;"></image>
+        <view style="margin-top: 15rpx;">
+            <text class="cuIcon-roundclose" style="font-size: 40rpx;color: #FFFFFF;"></text>
+        </view>
     </view>
 </van-popup>

packagecard/paypage/paypage.wxss

@@ -107,14 +107,19 @@
     font-weight: normal;
 }
 
+.code-box image {
+    width: 96rpx;
+    height: 96rpx;
+}
+
 .code-input {
-    text-align: right;
+    text-align: left;
     align-self: center;
     padding: 15rpx;
     margin-left: 15rpx;
     height: 70rpx;
     border-radius: 10rpx;
-    width: 70%;
+    width: 60%;
 }
 
 .treaty-box {
@@ -125,6 +130,9 @@
     margin-bottom: 40rpx;
     font-size: 28rpx;
     margin-top: 15rpx;
+    background-color: #ffffff;
+    height: 50%;
+    width: 90%;
 }
 
 .treaty-content-box {
@@ -133,6 +141,9 @@
     justify-content: center;
     align-items: center;
     padding: 15rpx;
+    height: 90%;
+    background-color: #ffffff;
+    border-radius: 5rpx;
 }
 
 .treaty-content-box .title {

pages/index/index.js

@@ -42,7 +42,8 @@ Page({
     isBindPhone: false,
     isNeedRefresh: true,
     isShowComment: false, //是否显示评论弹框
-    posterId: '', //分享过来的海报图片
+    posterId: '', //分享过来的海报ID
+    posterImg: '', //分享过来的海报图片
     isShowPoster: false,
     defaultBtnIcon: '/images/ic_share_img.png'
   },
@@ -55,15 +56,14 @@ Page({
         isMine: 2
       })
     }
-    self.buildId()
+    if (options.cardTemplateUseId) {
-    self.doLogin()
-    if (options.posterId) {
       //展示图片
       self.setData({
-        posterId: options.posterId,
+        posterId: options.cardTemplateUseId
-        isShowPoster: true
       })
     }
+    self.buildId()
+    self.doLogin()
   },
   // 登录
   doLogin() {
@@ -100,6 +100,9 @@ Page({
             }
             self.getOtherCard(2)
             self.getBtnIcon() //获取首页按钮图片
+            if (self.data.posterId != '') {
+              self.getPosterImg()
+            }
           })
           .catch(err => {
             wx.hideLoading({})
@@ -107,6 +110,28 @@ Page({
       }
     })
   },
+  //获取分享的海报
+  getPosterImg() {
+    var _self = this
+    app.http.get(app.urls.getMyCardDetail.format({
+        cardTemplateUseId: _self.data.posterId
+      }), {
+        header: {
+          token: app.globalData.token
+        }
+      })
+      .then(res => {
+        var img = _self.data.imgUrl + res.data.cardTemplateUsePhotoUrl
+        console.log(img)
+        _self.setData({
+          posterImg: img,
+          isShowPoster: true
+        })
+      })
+      .catch(err => {
+
+      })
+  },
   //首页按钮图片
   getBtnIcon() {
     var _self = this

pages/index/index.wxml

@@ -442,7 +442,7 @@
   custom-style="background-color:transparent;height:100%;width:100%;" round>
   <view bindtap="onClose"
     style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 80rpx;">
-    <image src="{{posterId}}" mode="widthFix" style="width: 80%;max-height: 70%;border-radius: 10rpx;"></image>
+    <image src="{{posterImg}}" mode="widthFix" style="width: 80%;max-height: 70%;border-radius: 10rpx;"></image>
     <view style="margin-top: 15rpx;">
       <text class="cuIcon-close" style="font-size: 40rpx;color: #FFFFFF;"></text>
     </view>

project.config.json

@@ -21,9 +21,9 @@
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
-        "useMultiFrameRuntime": false,
+        "useMultiFrameRuntime": true,
-        "useApiHook": false,
+        "useApiHook": true,
-        "useApiHostProcess": false,
+        "useApiHostProcess": true,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],

utils/api.js

@@ -1,15 +1,15 @@
 var apis = {
-    // url: 'http://192.168.0.115:8091/systemcard/',
+    url: 'http://192.168.0.115:8091/systemcard/',
-    // userCenter: 'http://192.168.0.115:8091/systemcard/',
+    userCenter: 'http://192.168.0.115:8091/systemcard/',
-    // baseImgUrl: 'http://192.168.0.115:8091/systemcard/route/file/download/true/',
+    baseImgUrl: 'http://192.168.0.115:8091/systemcard/route/file/download/true/',
 
     // url: 'https://cbc.wgink.ink/systemcard/',
     // userCenter: 'https://cbc.wgink.ink/systemcard/',
     // baseImgUrl: 'https://cbc.wgink.ink/systemcard/route/file/download/true/',
 
-    url: 'https://www.tenlion.com.cn/systemcard/',
+    // url: 'https://www.tenlion.com.cn/systemcard/',
-    userCenter: 'https://www.tenlion.com.cn/systemcard/',
+    // userCenter: 'https://www.tenlion.com.cn/systemcard/',
-    baseImgUrl: 'https://www.tenlion.com.cn/systemcard/route/file/download/true/',
+    // baseImgUrl: 'https://www.tenlion.com.cn/systemcard/route/file/download/true/',
 
     // url: 'http://192.168.0.111:8091/systemcard/',
     // userCenter: 'http://192.168.0.111:8091/systemcard/',
@@ -46,6 +46,7 @@ var apis = {
     getCardPayState: `app/cardcharge/savecharge/{mode}`, //获取开通名片的订单信息
     doSaveOrderPayState: `app/cardcharge/checkorder/{cardChargeOrderNumber}`, //保存订单支付状态
     getPayHistoryList: `app/cardcharge/listpage`, //获取
+    getVersionContrast: `app/projectconfigrelease/file/versionContrastPhoto`, //版本对比图
     /*用户 */
     /**店铺相关 **/
     doSaveShop: `app/shop/save`, //保存商店