Accueil Explorer Aide
Connexion
qmx
/
jy
14
0
Fork 0
Fichiers Tickets 2 Pull Requests 0 Wiki
Parcourir la source

Merge branch 'feature/v4.10.11' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.10.11

fuwencai il y a 3 mois
Parent
32e28b979e 8da056e821
commit
1420e3fea6
4 fichiers modifiés avec 245 ajouts et 58 suppressions
Vue séparée Afficher les stats Diff
  1. 53 51
      src/jfw/modules/app/src/web/templates/frontRouter/activity/free/exchange-success.html
  2. 100 0
      src/web/staticres/common-module/active/exchange/exchange-success.css
  3. 62 0
      src/web/staticres/common-module/active/exchange/exchange-success.js
  4. 30 7
      src/web/staticres/common-module/active/exchange/exchange.js

+ 53 - 51
src/jfw/modules/app/src/web/templates/frontRouter/activity/free/exchange-success.html
Voir le fichier 

@@ -2,71 +2,73 @@
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 
 <head>
 
-    <title>兑换中心</title>
 
-    <!--引入公共资源头部-->
 
-    {{include "/big-member/meta.html"}}
 
+  <title>兑换成功</title>
 
 
-    <!--S-当前页面的css资源-->
 
-    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
 
-    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
 
-    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
+ {{include "/big-member/meta.html"}}
 
+
 
+  <!--S-当前页面的css资源-->
 
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
 
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
 
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/css/app-share-sheet.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/account/css/fast-login.css?v={{Msg "seo" "version"}}"/>
 
-    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/exchange/exchange.css?v={{Msg "seo" "version"}}' />
 
-    <!--E-当前页面的css资源-->
 
-    <style>
 
-
 
-    </style>
 
-    <script>
 
-    </script>
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/exchange/exchange-success.css?v={{Msg "seo" "version"}}' />
 
+  <!--E-当前页面的css资源-->
 
+  <style>
 
+  </style>
 
 </head>
 
 
 <body>
 
-    <div class="j-container app">
 
-        {{include "/big-member/header.html"}}
 
-      <div class="j-main" id="main-app" v-cloak>
 
-        <div class="exchange-success-page">
 
-
 
-        </div>
 
-        <!--E-弹窗-->
 
-        <van-popup id="active-success-modal" v-model="dialog.show_success">
 
-          <div class="success-head">
 
-            <div class="success-title">兑换成功</div>
 
-          </div>
 
-          <p class="success-desc" v-html="dialog.success_desc1"></p>
 
-          <p class="success-desc mt-12">${dialog.success_desc2}</p>
 
-          <div class="swiper-box">
 
-            <van-swipe :loop="false" @change="swiperChange" :show-indicators="false" ref="success_swipe">
 
-              <van-swipe-item v-for="item in sc_qrlist">
 
-                <div class="sc_qr_box">
 
-                  <div class="sc_qr">
 
-                    <img :src="item.qrcode" alt="">
 
-                  </div>
 
-                  <p class="sc_desc">${item.name}</p>
 
-                </div>
 
-              </van-swipe-item>
 
-            </van-swipe>
 
-            <div class="sc_left" v-show="swiperleftShow" @click="swipeTo('left')"></div>
 
-            <div class="sc_right" v-show="swiperrightShow" @click="swipeTo('right')"></div>
 
+<div class="j-container app">
 
+{{include "/big-member/header.html"}}
 
+  <div class="j-main" id="main-app" v-cloak>
 
+    <div class="exchange-success-page">
 
+      <div class="success-header">
 
+        <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/exchange/img/new-header.png?v={{Msg "seo" "version"}}' alt="兑换成功">
 
+        <div class="success-title">兑换成功</div>
 
+        <p class="success-desc" v-html="info.success_desc1"></p>
 
+        <p class="success-desc mt-12">${info.success_desc2}</p>
 
+      </div>
 
+      <div class="success-main">
 
+        <p>您需使用如上手机号登录剑鱼标讯平台使用权益</p>
 
+        <div class="success-item-group">
 
+          <div class="success-item" v-for="(item, index) in info.list">
 
+            <div class="success-item-title">
 
+              <span class="success-item-title-before">方式${titleBefore[index]}</span>
 
+              <span>${item.label}</span>
 
+            </div>
 
+            <div class="success-item-img" v-if="item.img">
 
+              <img :src="item.img" :alt="item.label">
 
+            </div>
 
+            <p class="success-item-desc" v-if="item.desc">${item.desc}</p>
 
+            <p class="success-item-desc-after" v-if="item.desc_after">${item.desc_after}</p>
 
+            <div class="success-item-desc-app" v-if="item.app">
 
+              <a class="highlight-text" href="https://wx.jianyu360.cn/front/downloadapppage/normal?source=H5&f=exchange">去下载 ></a>
 
+            </div>
 
+            <div class="success-item-desc-pc" v-if="item.pc">
 
+              <span class="pc-link">https://www.jianyu360.cn/</span>
 
+              <span class="highlight-text" @click="doCopy">复制链接</span>
 
+            </div>
 
           </div>
 
-          <div class="success-foot-btn" @click="dialog.show_success = false">我知道了</div>
 
-        </van-popup>
 
+        </div>
 
+
 
       </div>
 
+
 
     </div>
 
+  </div>
 
+</div>
 
 
-    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
 
-    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
 
-    <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js> </script>
 
-    <script src=//cdn-common.jianyu360.com/cdn/lib/moment/2.29.1/min/moment.min.js></script>
 
-    <script src="//cdn-common.jianyu360.com/cdn/lib/number-auth-web-sdk/2.1.2/numberAuth-web-sdk.js"></script>
 
-    {{include "/big-member/commonjs.html"}}
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js> </script>
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/moment/2.29.1/min/moment.min.js></script>
 
+{{include "/big-member/commonjs.html"}}
 
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 
     <!-- <script src=//res2.wx.qq.com/open/js/jweixin-1.6.0.js></script> -->
 
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/wx-sdk-share.js?v={{Msg "seo" "version"}}'></script>
 
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/app-share-sheet.js?v={{Msg "seo" "version"}}'></script>
 
-    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/account/js/fast-login.js?v={{Msg "seo" "version" }}'></script>
 
-    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/exchange/exchange.js?v={{Msg "seo" "version"}}'></script>
 
-    {{include "/common/baiducc.html"}}
 
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/exchange/exchange-success.js?v={{Msg "seo" "version"}}'></script>
 
+{{include "/common/baiducc.html"}}
 
 </body>
 
 
 </html>

+ 100 - 0
src/web/staticres/common-module/active/exchange/exchange-success.css
Voir le fichier 

@@ -0,0 +1,100 @@
 
+
 
+#main-app{
 
+  background-color: #F5F6F7;
 
+  padding: 0;
 
+}
 
+
 
+.success-title {
 
+  font-size: 0.4rem;
 
+  line-height: 0.52rem;
 
+  color: #171826;
 
+  text-align: center;
 
+  margin-top: 0.62rem;
 
+  margin-bottom: 0.32rem;
 
+}
 
+
 
+.success-desc {
 
+  color: #171826;
 
+  font-size: 0.3rem;
 
+  line-height: 0.44rem;
 
+  text-align: center;
 
+}
 
+
 
+.success-header {
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  justify-content: center;
 
+  background: #fff;
 
+  margin-bottom: 0.16rem;
 
+  padding: 0.64rem 0.56rem 0.32rem 0.32rem;
 
+}
 
+.success-header img {
 
+  width: 2.52rem;
 
+}
 
+.success-main {
 
+  background: #fff;
 
+  padding: 0.56rem   0.32rem  0.64rem 0.32rem;
 
+}
 
+
 
+.success-item {
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  margin-top: 0.56rem;
 
+}
 
+.success-item .success-item-title {
 
+  display: flex;
 
+  flex-direction: row;
 
+  align-items: center;
 
+  min-width: 4.52rem;
 
+  height: 0.64rem;
 
+  font-size: 0.3rem;
 
+  line-height: 0.64rem;
 
+  border: 1px solid rgba(135, 223, 234, 1);
 
+  border-radius: 0.32rem;
 
+  padding-right: 0.4rem;
 
+  color: #2cb7ca;
 
+}
 
+.success-item .success-item-title-before {
 
+  display: inline-block;
 
+  height: 0.64rem;
 
+  line-height: 0.64rem;
 
+  padding: 0 0.24rem;
 
+  color: #fff;
 
+  background: #2cb7ca;
 
+  border-radius: 0.32rem;
 
+  margin-right: 0.32rem;
 
+}
 
+.success-item .success-item-desc-after {
 
+  margin-top: 0.08rem;
 
+  color: #5f5e64;
 
+  font-size: 0.28rem;
 
+  line-height: 0.4rem;
 
+}
 
+.success-item .success-item-desc-pc .pc-link {
 
+  color: #5f5e64;
 
+  margin-right: 0.32rem;
 
+}
 
+.success-item .success-item-desc-pc {
 
+  margin-top: 0.24rem;
 
+  font-size: 0.28rem;
 
+  line-height: 0.4rem;
 
+}
 
+.success-item .success-item-app {
 
+  margin-top: 0.24rem;
 
+  font-size: 0.28rem;
 
+  line-height: 0.4rem;
 
+}
 
+.success-item .success-item-desc {
 
+  margin-top: 0.24rem;
 
+  color: rgba(23, 24, 38, 1);
 
+  font-size: 0.28rem;
 
+  line-height: 0.4rem;
 
+
 
+}
 
+.success-item .success-item-img {
 
+  width: 2.62rem;
 
+  height: 2.62rem;
 
+  margin-top: 0.32rem;
 
+}

+ 62 - 0
src/web/staticres/common-module/active/exchange/exchange-success.js
Voir le fichier 

@@ -0,0 +1,62 @@
 
+var sVm = new Vue({
 
+  el: '#main-app',
 
+  delimiters: ['${', '}'],
 
+  mixins: [shareMixin],
 
+  data: {
 
+    titleBefore: ['一', '二', '三', '四', '五', '六'],
 
+    info: {
 
+      success: true,
 
+      success_desc1:'',
 
+      success_desc2:'',
 
+      list: [
 
+        {
 
+          label: '剑鱼标讯公众号',
 
+          img: 'https://www.jianyu360.cn/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan',
 
+          desc: '长按识别进入公众号',
 
+          desc_after: '如未绑定手机号，绑定兑换手机号即可'
 
+        },
 
+        {
 
+          label: '剑鱼标讯网小程序',
 
+          img: 'https://www.jianyu360.cn/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan',
 
+          desc: '长按识别进入小程序',
 
+        },
 
+        {
 
+          label: '剑鱼标讯App',
 
+          img: 'https://www.jianyu360.cn/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan',
 
+          app: true
 
+        },
 
+        {
 
+          label: '剑鱼标讯PC端',
 
+          img: 'https://www.jianyu360.cn/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan',
 
+          desc: '请您复制剑鱼标讯链接在PC端浏览器打开页面，在PC端使用兑换的权益。',
 
+          pc: true
 
+        }
 
+      ]
 
+    },
 
+  },
 
+  mounted: function () {
 
+    this.doLoad()
 
+  },
 
+  methods: {
 
+    doLoad () {
 
+      const info = JSON.parse(sessionStorage.getItem('ex-success-info') || '{}')
 
+      if (info.success) {
 
+        this.info = info
 
+      } else {
 
+        window.close()
 
+      }
 
+    },
 
+    doCopy () {
 
+      this.copyText('https://www.jianyu360.cn/')
 
+      this.$toast('复制成功')
 
+    },
 
+    copyText: function (text) {
 
+      const input = document.createElement('textarea') // js创建一个input输入框
 
+      input.value = text // 将需要复制的文本赋值到创建的input输入框中
 
+      document.body.appendChild(input) // 将输入框暂时创建到实例里面
 
+      input.select() // 选中输入框中的内容
 
+      document.execCommand('copy') // 执行复制操作
 
+      document.body.removeChild(input) // 最后删除实例中临时创建的input输入框，完成复制操作
 
+    },
 
+  }
 
+})

+ 30 - 7
src/web/staticres/common-module/active/exchange/exchange.js
Voir le fichier 

@@ -124,13 +124,32 @@ var exchangeV = new Vue({
 
             if(res.data.status === 0){
 
               _this.$toast('提交失败，请重试')
 
             }else if(res.data.status === 1){
 
-              _this.swiperIndex = 0
 
-              _this.dialog.success_desc1 ='您已经成功兑换 <span class="highlight-text">' + res.data.name + '</span> 权益。'
 
-              _this.dialog.success_desc2 ='您需要前往' + res.data.industry + '相关小程序（行业相关）上去使用。'
 
-              _this.sc_qrlist = res.data.list
 
-              _this.dialog.show_success = true
 
-              _this.form.identCode = ''
 
-              _this.form.imgCode = ''
 
+              if (res.data.isxcx === 1) {
 
+                _this.swiperIndex = 0
 
+                _this.dialog.success_desc1 ='您已经成功兑换 <span class="highlight-text">' + res.data.name + '</span> 权益。'
 
+                _this.dialog.success_desc2 ='您需要前往' + res.data.industry + '相关小程序（行业相关）上去使用。'
 
+                _this.sc_qrlist = res.data.list
 
+                _this.dialog.show_success = true
 
+                _this.form.identCode = ''
 
+                _this.form.imgCode = ''
 
+              } else {
 
+                sessionStorage.setItem('ex-success-info', JSON.stringify({
 
+                  success: true,
 
+                  success_desc1: '您已经成功兑换 <span class="highlight-text">' + res.data.name + '</span> 权益',
 
+                  success_desc2:'兑换所用手机号：' + _this.form.phone,
 
+                  list: res.data.list.map(function (v) {
 
+                    return {
 
+                      label: v.name,
 
+                      img: v.qrcode || '',
 
+                      desc: v.text || '',
 
+                      desc_after: v.remark || '',
 
+                      app: (v.name || '').toLocaleLowerCase().indexOf('app') !== -1,
 
+                      pc: Boolean(v.url || false)
 
+                    }
 
+                  })
 
+                }))
 
+                location.href = './exchange-success'
 
+              }
 
             }else if(res.data.status === -1){
 
               _this.errorTip = '短信验证码错误'
 
             }else if(res.data.status === -2){
 
@@ -148,6 +167,10 @@ var exchangeV = new Vue({
 
               _this.dialog.show_kf = true
 
               _this.form.identCode = ''
 
               _this.form.imgCode = ''
 
+            }else if(res.data.status === -8){
 
+              _this.errorTip = '手机号用户当前不能兑换'
 
+            }else if(res.data.status === -9){
 
+              _this.errorTip = '手机号用户已无剩余可兑换次数'
 
             }
 
           } else {
 
             _this.$toast(res.error_msg || '请稍后重试')