张延森 5 年前
父节点
当前提交
a1ce686bf6
共有 9 个文件被更改,包括 113 次插入44 次删除
  1. 79
    2
      package-lock.json
  2. 2
    2
      src/App.vue
  3. 二进制
      src/assets/topImg.jpg
  4. 二进制
      src/assets/topImg.png
  5. 1
    1
      src/store/main.js
  6. 1
    1
      src/util/api.js
  7. 3
    1
      src/util/util.js
  8. 14
    22
      src/views/supportDetail/supportDetail.vue
  9. 13
    15
      src/views/supportMain/supportMain.vue

+ 79
- 2
package-lock.json 查看文件

823
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
823
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
824
       "dev": true
824
       "dev": true
825
     },
825
     },
826
+    "@vant/icons": {
827
+      "version": "1.1.7",
828
+      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.1.7.tgz",
829
+      "integrity": "sha1-KVYa3/+mp1DSedzNvpppt0OTTz8=",
830
+      "dev": true
831
+    },
832
+    "@vue/babel-helper-vue-jsx-merge-props": {
833
+      "version": "1.0.0",
834
+      "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
835
+      "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA=",
836
+      "dev": true
837
+    },
826
     "@vue/babel-preset-app": {
838
     "@vue/babel-preset-app": {
827
       "version": "3.2.0",
839
       "version": "3.2.0",
828
       "resolved": "http://registry.npm.taobao.org/@vue/babel-preset-app/download/@vue/babel-preset-app-3.2.0.tgz",
840
       "resolved": "http://registry.npm.taobao.org/@vue/babel-preset-app/download/@vue/babel-preset-app-3.2.0.tgz",
1725
       "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
1737
       "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
1726
       "dev": true
1738
       "dev": true
1727
     },
1739
     },
1740
+    "axios": {
1741
+      "version": "0.18.1",
1742
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.18.1.tgz",
1743
+      "integrity": "sha1-/z8N4ue10YDnV62YAA8Qgbh7zqM=",
1744
+      "dev": true,
1745
+      "requires": {
1746
+        "follow-redirects": "1.5.10",
1747
+        "is-buffer": "^2.0.2"
1748
+      },
1749
+      "dependencies": {
1750
+        "is-buffer": {
1751
+          "version": "2.0.3",
1752
+          "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.3.tgz",
1753
+          "integrity": "sha1-Ts8/z3ScvR5HJonhCaxmJhol5yU=",
1754
+          "dev": true
1755
+        }
1756
+      }
1757
+    },
1728
     "babel-code-frame": {
1758
     "babel-code-frame": {
1729
       "version": "6.26.0",
1759
       "version": "6.26.0",
1730
       "resolved": "http://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz",
1760
       "resolved": "http://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz",
4726
         "ansi-regex": {
4756
         "ansi-regex": {
4727
           "version": "2.1.1",
4757
           "version": "2.1.1",
4728
           "bundled": true,
4758
           "bundled": true,
4729
-          "dev": true
4759
+          "dev": true,
4760
+          "optional": true
4730
         },
4761
         },
4731
         "aproba": {
4762
         "aproba": {
4732
           "version": "1.2.0",
4763
           "version": "1.2.0",
4935
         "minimist": {
4966
         "minimist": {
4936
           "version": "0.0.8",
4967
           "version": "0.0.8",
4937
           "bundled": true,
4968
           "bundled": true,
4938
-          "dev": true
4969
+          "dev": true,
4970
+          "optional": true
4939
         },
4971
         },
4940
         "minipass": {
4972
         "minipass": {
4941
           "version": "2.2.4",
4973
           "version": "2.2.4",
4942
           "bundled": true,
4974
           "bundled": true,
4943
           "dev": true,
4975
           "dev": true,
4976
+          "optional": true,
4944
           "requires": {
4977
           "requires": {
4945
             "safe-buffer": "^5.1.1",
4978
             "safe-buffer": "^5.1.1",
4946
             "yallist": "^3.0.0"
4979
             "yallist": "^3.0.0"
4959
           "version": "0.5.1",
4992
           "version": "0.5.1",
4960
           "bundled": true,
4993
           "bundled": true,
4961
           "dev": true,
4994
           "dev": true,
4995
+          "optional": true,
4962
           "requires": {
4996
           "requires": {
4963
             "minimist": "0.0.8"
4997
             "minimist": "0.0.8"
4964
           }
4998
           }
5052
           "version": "1.4.0",
5086
           "version": "1.4.0",
5053
           "bundled": true,
5087
           "bundled": true,
5054
           "dev": true,
5088
           "dev": true,
5089
+          "optional": true,
5055
           "requires": {
5090
           "requires": {
5056
             "wrappy": "1"
5091
             "wrappy": "1"
5057
           }
5092
           }
5193
           "version": "3.0.1",
5228
           "version": "3.0.1",
5194
           "bundled": true,
5229
           "bundled": true,
5195
           "dev": true,
5230
           "dev": true,
5231
+          "optional": true,
5196
           "requires": {
5232
           "requires": {
5197
             "ansi-regex": "^2.0.0"
5233
             "ansi-regex": "^2.0.0"
5198
           }
5234
           }
11149
         "spdx-expression-parse": "^3.0.0"
11185
         "spdx-expression-parse": "^3.0.0"
11150
       }
11186
       }
11151
     },
11187
     },
11188
+    "vant": {
11189
+      "version": "1.6.24",
11190
+      "resolved": "https://registry.npm.taobao.org/vant/download/vant-1.6.24.tgz",
11191
+      "integrity": "sha1-D8d5MKfy6lpk++TiP+/UH5kRhZc=",
11192
+      "dev": true,
11193
+      "requires": {
11194
+        "@babel/runtime": "^7.4.3",
11195
+        "@vant/icons": "1.1.7",
11196
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0-beta.3",
11197
+        "vue-lazyload": "1.2.3"
11198
+      },
11199
+      "dependencies": {
11200
+        "@babel/runtime": {
11201
+          "version": "7.5.5",
11202
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.5.5.tgz?cache=0&sync_timestamp=1563398515522&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.5.5.tgz",
11203
+          "integrity": "sha1-dPulbTXvvspEQJHHhQzNSU/S8TI=",
11204
+          "dev": true,
11205
+          "requires": {
11206
+            "regenerator-runtime": "^0.13.2"
11207
+          }
11208
+        },
11209
+        "regenerator-runtime": {
11210
+          "version": "0.13.3",
11211
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.3.tgz",
11212
+          "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U=",
11213
+          "dev": true
11214
+        }
11215
+      }
11216
+    },
11152
     "vary": {
11217
     "vary": {
11153
       "version": "1.1.2",
11218
       "version": "1.1.2",
11154
       "resolved": "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
11219
       "resolved": "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
11217
       "integrity": "sha1-stPZVAKoEWAjgHg+pPVm64dVaaI=",
11282
       "integrity": "sha1-stPZVAKoEWAjgHg+pPVm64dVaaI=",
11218
       "dev": true
11283
       "dev": true
11219
     },
11284
     },
11285
+    "vue-lazyload": {
11286
+      "version": "1.2.3",
11287
+      "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz",
11288
+      "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw=",
11289
+      "dev": true
11290
+    },
11220
     "vue-loader": {
11291
     "vue-loader": {
11221
       "version": "15.4.2",
11292
       "version": "15.4.2",
11222
       "resolved": "http://registry.npm.taobao.org/vue-loader/download/vue-loader-15.4.2.tgz",
11293
       "resolved": "http://registry.npm.taobao.org/vue-loader/download/vue-loader-15.4.2.tgz",
11527
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
11598
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
11528
       "dev": true
11599
       "dev": true
11529
     },
11600
     },
11601
+    "weixin-js-sdk": {
11602
+      "version": "1.4.0-test",
11603
+      "resolved": "https://registry.npm.taobao.org/weixin-js-sdk/download/weixin-js-sdk-1.4.0-test.tgz",
11604
+      "integrity": "sha1-YSu6/Ml62E9a/m3IRwFTTMWfw8o=",
11605
+      "dev": true
11606
+    },
11530
     "which": {
11607
     "which": {
11531
       "version": "1.3.1",
11608
       "version": "1.3.1",
11532
       "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",
11609
       "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",

+ 2
- 2
src/App.vue 查看文件

19
       let oldCode = localStorage.getItem('code')
19
       let oldCode = localStorage.getItem('code')
20
       if (this.code === oldCode) {
20
       if (this.code === oldCode) {
21
         localStorage.setItem('code', this.code)
21
         localStorage.setItem('code', this.code)
22
-        this.toolClass.getCode('wx32e2e8c81f66070e')
22
+        this.toolClass.getCode('wx18765573b7565aed')
23
       } else {
23
       } else {
24
         localStorage.setItem('code', this.code)
24
         localStorage.setItem('code', this.code)
25
         this.customer(this.code).then(() => {
25
         this.customer(this.code).then(() => {
27
         })
27
         })
28
       }
28
       }
29
     } else {
29
     } else {
30
-      this.toolClass.getCode('wx32e2e8c81f66070e')
30
+      this.toolClass.getCode('wx18765573b7565aed')
31
     }
31
     }
32
   },
32
   },
33
   methods: {
33
   methods: {

二进制
src/assets/topImg.jpg 查看文件


二进制
src/assets/topImg.png 查看文件


+ 1
- 1
src/store/main.js 查看文件

4
 export default {
4
 export default {
5
   namespaced: true,
5
   namespaced: true,
6
   state: {
6
   state: {
7
-    gameid: '1',
7
+    gameid: '2',
8
     game: {},
8
     game: {},
9
     userInfo: {},
9
     userInfo: {},
10
     recordInfo: {},
10
     recordInfo: {},

+ 1
- 1
src/util/api.js 查看文件

1
-const baseUrl = '/api'
1
+const baseUrl = '/bargain-api'
2
 const common = ''
2
 const common = ''
3
 
3
 
4
 const $api = {
4
 const $api = {

+ 3
- 1
src/util/util.js 查看文件

40
     return theRequest
40
     return theRequest
41
   },
41
   },
42
   getCode: (appid) => {
42
   getCode: (appid) => {
43
-    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(window.location.href)}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
43
+    const current = window.location.href
44
+    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(current)}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
45
+
44
     window.location.href = url
46
     window.location.href = url
45
   },
47
   },
46
 
48
 

+ 14
- 22
src/views/supportDetail/supportDetail.vue 查看文件

14
               <p>
14
               <p>
15
                 已有
15
                 已有
16
                 <span class="marked">{{list.length}}</span> 位好友帮TA砍价了,共砍掉
16
                 <span class="marked">{{list.length}}</span> 位好友帮TA砍价了,共砍掉
17
-                <span class="marked">¥{{(list.length*29.6).toFixed(1)}}</span> 元
17
+                <span class="marked">¥{{(list.length*12).toFixed(1)}}</span> 元
18
               </p>
18
               </p>
19
             </div>
19
             </div>
20
           </div>
20
           </div>
22
         <div class="self-end" v-if="status==4">
22
         <div class="self-end" v-if="status==4">
23
           <div>
23
           <div>
24
             恭喜你!已砍至
24
             恭喜你!已砍至
25
-            <span>0</span>
25
+            <span>18.8</span>
26
             <span>元</span>
26
             <span>元</span>
27
           </div>
27
           </div>
28
-          <div>获得价值1888元的悦见山新年全家福定制台历拍摄福利</div>
29
-          <div>请及时前往江北新区.白马路10号.银城颐居.悦见山营销中心领取</div>
28
+          <div>前往银城颐居·悦见山营销中心,现场支付18.8元</div>
29
+          <div>即可获得价值78.8元悦见山星级泳池体验机会1次</div>
30
         </div>
30
         </div>
31
       </div>
31
       </div>
32
       <div class="active" v-if="status<4">
32
       <div class="active" v-if="status<4">
33
-        <h2>悦见山全家福拍摄助力砍价活动</h2>
33
+        <h2>悦见山恒温泳池好友助力砍价活动</h2>
34
         <div class="price">
34
         <div class="price">
35
-          <span :class="{'off':status == 3}">砍后价:¥{{(888-list.length*29.6).toFixed(1)}}</span>
36
-          <span>最多砍至0元</span>
35
+          <span :class="{'off':status == 3}">砍后价:¥{{(78.8-list.length*12).toFixed(1)}}</span>
36
+          <span>最多砍至18.8元</span>
37
         </div>
37
         </div>
38
         <div class="desc">
38
         <div class="desc">
39
-          <span>原价1888元, 悦见山亲情价¥888</span>
40
-          <span>仅剩{{game.note.LeftNum}}个名额</span>
39
+          <span>原价78.8元, 悦见山亲情价¥18.8</span>
41
         </div>
40
         </div>
42
       </div>
41
       </div>
43
       <div class="list">
42
       <div class="list">
55
           </div>
54
           </div>
56
           <div class="price">
55
           <div class="price">
57
             <span>已砍:</span>
56
             <span>已砍:</span>
58
-            <span>¥29.6</span>
57
+            <span>¥12</span>
59
           </div>
58
           </div>
60
         </div>
59
         </div>
61
       </div>
60
       </div>
66
         <div class="log1">
65
         <div class="log1">
67
           <div>您已成功帮好友砍掉</div>
66
           <div>您已成功帮好友砍掉</div>
68
           <div>
67
           <div>
69
-            29.6
68
+            12
70
             <span>元</span>
69
             <span>元</span>
71
           </div>
70
           </div>
72
-          <div @click="toLuckDraw()" style="font-weight:700;font-size:.18rem;color:#C54024;">
73
-            您有一次抽奖机会,立即前往
74
-            <i class="iconfont icon-you"></i>
75
-          </div>
76
           <img class="btn" :src="btn" @click="$router.push({name:'supportMain'})">
71
           <img class="btn" :src="btn" @click="$router.push({name:'supportMain'})">
77
         </div>
72
         </div>
78
       </div>
73
       </div>
79
     </div>
74
     </div>
80
     <div class="other-end" v-if="status == 5">
75
     <div class="other-end" v-if="status == 5">
81
       <div class="box">
76
       <div class="box">
82
-        <p>您的好友已砍价至0元,</p>
77
+        <p>您的好友已砍价至18.8元,</p>
83
         <p>感谢您的参与</p>
78
         <p>感谢您的参与</p>
84
         <div @click="$router.push({name:'supportMain'})">我也要报名</div>
79
         <div @click="$router.push({name:'supportMain'})">我也要报名</div>
85
       </div>
80
       </div>
207
     share (recordid) {
202
     share (recordid) {
208
       let link = `${window.location.origin}${window.location.pathname}#/supportDetail/other/${recordid}`
203
       let link = `${window.location.origin}${window.location.pathname}#/supportDetail/other/${recordid}`
209
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
204
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
210
-        title: '定格陪伴,悦见山全家福定制台历拍摄火热报名中',
211
-        desc: '我正在参加悦见山助力活动,快来帮我助力吧~',
205
+        title: '热浪席卷盛夏,好友助力砍价',
206
+        desc: '悦见山星级泳池即将开放,18.8元抢鲜泳池体验+指定饮品~',
212
         link: link,
207
         link: link,
213
-        thu_image: `http://spaceofcheng.oss-cn-beijing.aliyuncs.com/IMG_58371544441587.JPG?x-oss-process=style/wxicon`
208
+        thu_image: `http://spaceofcheng.oss-cn-beijing.aliyuncs.com/20190801kanjia.jpg?x-oss-process=style/wxicon`
214
       }).then(() => {
209
       }).then(() => {
215
         setTimeout(() => {
210
         setTimeout(() => {
216
           this.checkStatus()
211
           this.checkStatus()
229
       } else if (this.status === 3) {
224
       } else if (this.status === 3) {
230
         this.$toast('活动已结束')
225
         this.$toast('活动已结束')
231
       }
226
       }
232
-    },
233
-    toLuckDraw () {
234
-      window.location.href = 'http://spaceofcheng.ycjcjy.com/game/luckdraw/#/?lotteryId=d04f645f-5557-48f3-9ad3-4cf3546dbc23'
235
     }
227
     }
236
   }
228
   }
237
 }
229
 }

+ 13
- 15
src/views/supportMain/supportMain.vue 查看文件

4
       <div class="top">
4
       <div class="top">
5
         <img :src="topImg">
5
         <img :src="topImg">
6
         <div class="top-div">
6
         <div class="top-div">
7
-          <b>悦见山全家福拍摄助力砍价活动</b>
8
-          <p>报名截止时间:2018年12月18日</p>
9
-          <p>拍摄时间:2018年12月13日——2018年12月29日</p>
10
-          <p>地点:国家级江北新区•白马路10号银城颐居·悦见山营销中心</p>
7
+          <b>悦见山恒温泳池好友助力砍价活动</b>
8
+          <p>报名截止时间:2019年8月31日</p>
9
+          <p>地点:国家级江北新区•白马路10号</p>
11
           <p>活动电话:025-86505555</p>
10
           <p>活动电话:025-86505555</p>
12
         </div>
11
         </div>
13
       </div>
12
       </div>
14
       <div class="main">
13
       <div class="main">
15
         <h2>活动详情</h2>
14
         <h2>活动详情</h2>
16
-        <div>悦见山全家福拍摄助力砍价活动</div>
17
-        <p>原价:1888元&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;悦见山年终回馈价:888元</p>
18
-        <p>点击下方的“立即报名”参加报名,分享给30位好友,让好友助力帮忙您完成任务,2018年12月13日—2018年12月18日每天前10名完成任务的客户即可参加项目的全家福拍摄及台历定制;</p>
15
+        <div>悦见山恒温泳池好友助力砍价活动</div>
16
+        <p>原价:78.8元&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;悦见山年终回馈价:18.8元</p>
17
+        <p>点击下方的“立即报名”参加报名,分享给5位好友,让好友助力帮忙您完成任务,每位好友可帮砍12元;</p>
19
         <div>套餐包含:</div>
18
         <div>套餐包含:</div>
20
-        <div>服务团队:2名主力摄影师,1名主力化妆师,1名主力引导师,1名主力设计师</div>
21
-        <div>服装提供:提供亲子全家福服装一套</div>
22
-        <div>拍摄精修:赠送6张精修底片并刻盘</div>
23
-        <div>台历赠送:赠送2019年新年定制专属台历一本(含6张全家福照片)</div>
19
+        <div>悦见山星级泳池体验一次(限时2小时)</div>
20
+        <div>城咖啡指定饮品一杯</div>
21
+        <div>备注:购买后请提前一天电话预约生效.</div>
24
       </div>
22
       </div>
25
     </div>
23
     </div>
26
     <div class="bottom">
24
     <div class="bottom">
50
 </template>
48
 </template>
51
 
49
 
52
 <script>
50
 <script>
53
-import topImg from '@/assets/topImg.png'
51
+import topImg from '@/assets/topImg.jpg'
54
 import area from '@/util/area.js'
52
 import area from '@/util/area.js'
55
 import { createNamespacedHelpers } from 'vuex'
53
 import { createNamespacedHelpers } from 'vuex'
56
 import wxsdk from '@/util/share'
54
 import wxsdk from '@/util/share'
140
     share () {
138
     share () {
141
       let link = `${window.location.origin}${window.location.pathname}#/`
139
       let link = `${window.location.origin}${window.location.pathname}#/`
142
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
140
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
143
-        title: '定格陪伴,悦见山全家福定制台历拍摄火热报名中',
144
-        desc: '我正在参加悦见山助力活动,快来帮我助力吧~',
141
+        title: '热浪席卷盛夏,好友助力砍价',
142
+        desc: '悦见山星级泳池即将开放,18.8元抢鲜泳池体验+指定饮品!',
145
         link: link,
143
         link: link,
146
-        thu_image: `http://spaceofcheng.oss-cn-beijing.aliyuncs.com/IMG_58371544441587.JPG?x-oss-process=style/wxicon`
144
+        thu_image: `http://spaceofcheng.oss-cn-beijing.aliyuncs.com/20190801kanjia.jpg?x-oss-process=style/wxicon`
147
       })
145
       })
148
     },
146
     },
149
     record () {
147
     record () {