ytj

src/App.vue

@@ -1,23 +1,37 @@
 <template>
-  <div id="app">
+  <div id="app" v-if="showPage">
     <router-view/>
   </div>
 </template>
 
 <script>
 import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('main')
+const { mapActions: mapIndexActions } = createNamespacedHelpers('main')
 export default {
   data () {
-    return {}
+    return {
+      showPage: false
+    }
   },
-  computed:{
-    ...mapIndexState({
-      userInfo: item => item.userInfo
-    })
+  created () {
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
+      this.code = this.toolClass.UrlSearch(location.search).code
+      let oldCode = localStorage.getItem('code')
+      if (this.code === oldCode) {
+        localStorage.setItem('code', this.code)
+        this.toolClass.getCode('wx32e2e8c81f66070e')
+      } else {
+        localStorage.setItem('code', this.code)
+        this.customer(this.code).then(() => {
+          this.showPage = true
+        })
+      }
+    } else {
+      this.toolClass.getCode('wx32e2e8c81f66070e')
+    }
   },
-  methods:{
-    ...mapIndexActions(['setUserInfo'])
+  methods: {
+    ...mapIndexActions(['customer'])
   }
 }
 </script>

src/router.js

@@ -14,7 +14,7 @@ export default new Router({
       component: () => import(/* webpackChunkName: "supportMain" */ './views/supportMain/supportMain.vue')
     },
     {
-      path: '/supportDetail',
+      path: '/supportDetail/:other/:recordid',
       name: 'supportDetail',
       component: () => import(/* webpackChunkName: "supportDetail" */ './views/supportDetail/supportDetail.vue')
     }

src/store/main.js

@@ -6,19 +6,10 @@ export default {
   state: {
     gameid: '1',
     game: {},
-    userInfo: {
-      Address: "江苏省,南京市,玄武区",
-      CreateDate: "2018-12-08T19:06:15+08:00",
-      CustomerId: "1",
-      CustomerName: "kini",
-      HeadImg: "",
-      Name: "袁天骄",
-      Openid: "123",
-      Phone: "13776975175",
-      Sex: 0
-    },
+    userInfo: {},
     recordInfo: {},
-    supports: []
+    supports: [],
+    recordUser: {}
   },
   mutations: {
     updateGame (state, data) {
@@ -30,6 +21,7 @@ export default {
     updateRecordInfo (state, data) {
       state.recordInfo = data.record || {}
       state.supports = data.supports || []
+      state.recordUser = data.customer || {}
     }
   },
   actions: {
@@ -65,7 +57,7 @@ export default {
         ajax({
           ...api.signup,
           urlData: {
-            customerid: context.state.userInfo.customerid
+            customerid: context.state.userInfo.CustomerId
           },
           data: data
         }).then((res) => {

src/util/api.js

@@ -25,6 +25,10 @@ const $api = {
   setSupport: { // 助力
     method: 'post',
     url: `${baseUrl}${common}/support/:customerid/:recordid`
+  },
+  share:{ // 分享
+    method: 'get',
+    url: `${baseUrl}${common}/wechat/jssdk/signature`
   }
 }
 export default $api

src/util/share.js

@@ -12,8 +12,8 @@ function wxsdk (params, config) {
   }
   // 初始化
   return new Promise(function (resolve, reject) {
-    Ajax(api.share.share.url, {
-      method: api.share.share.method,
+    Ajax({
+      ...api.share,
       queryData: {
         ...params
       }
@@ -37,6 +37,8 @@ function wxsdk (params, config) {
         ]
       })
       wx.ready(function () {
+        // 此console.log不要删除，删除后可能会出错
+        console.log('share', shareData)
         wx.onMenuShareTimeline(shareData)
         wx.onMenuShareAppMessage(shareData)
         resolve('success')

src/util/util.js

@@ -40,7 +40,7 @@ const toolClass = {
     return theRequest
   },
   getCode: (appid) => {
-    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
+    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`
     window.location.href = url
   },
 

src/views/supportDetail/supportDetail.vue

@@ -7,14 +7,14 @@
           <div class="countdown" :class="{'on':status < 3,'off':status == 3}" v-html="countdown"></div>
           <div class="userInfo">
             <div class="avatars">
-              <img class="cover" :src="userInfo.HeadImg">
+              <img class="cover" :src="recordUser.HeadImg">
             </div>
             <div class="info">
-              <p>&nbsp;{{userInfo.Name}}</p>
+              <p>&nbsp;{{recordUser.Name}}</p>
               <p>
                 已有
                 <span class="marked">{{list.length}}</span> 位好友帮TA砍价了，共砍掉
-                <span class="marked">￥{{list.length*29.6}}</span> 元
+                <span class="marked">￥{{(list.length*29.6).toFixed(1)}}</span> 元
               </p>
             </div>
           </div>
@@ -25,19 +25,18 @@
             <span>0</span>
             <span>元</span>
           </div>
-          <div>获得一次免费拍照机会~</div>
-          <div>请及时前往江北新区.白马路10号.银城颐居.</div>
-          <div>悦见山营销中心领取</div>
+          <div>获得价值1888元的悦见山感恩馈赠福利一份</div>
+          <div>请及时前往江北新区.白马路10号.银城颐居.悦见山营销中心领取</div>
         </div>
       </div>
       <div class="active" v-if="status<4">
         <h2>悦见山全家福拍摄助力砍价活动</h2>
         <div class="price">
-          <span :class="{'off':status == 3}">砍后价：￥{{888-list.length*29.6}}</span>
+          <span :class="{'off':status == 3}">砍后价：￥{{(888-list.length*29.6).toFixed(1)}}</span>
           <span>最多砍至0元</span>
         </div>
         <div class="desc">
-          <span>原价2888元, 悦见山亲情价￥888</span>
+          <span>原价1888元, 悦见山亲情价￥888</span>
           <span>仅剩{{game.note.LeftNum}}个名额</span>
         </div>
       </div>
@@ -48,11 +47,11 @@
         </div>
         <div class="item" v-for="(item,index) in list" :key="index">
           <div class="avatars">
-            <img class="cover" :src="paihang" alt>
+            <img class="cover" :src="item.HeadImg" alt>
           </div>
           <div class="info">
-            <p>Lina豆豆</p>
-            <span>2018-9-0</span>
+            <p>{{item.CustomerName}}</p>
+            <span>{{toolClass.dateFormat(item.CreateDate,'yyyy-MM-dd')}}</span>
           </div>
           <div class="price">
             <span>已砍：</span>
@@ -61,8 +60,7 @@
         </div>
       </div>
     </div>
-    <!-- <div class="dailog" v-if="showDailog" @click="showDailog = false"> -->
-    <div class="dailog" v-if="showDailog">
+    <div class="dailog" v-if="showDailog" @click="showDailog = false">
       <div class="dailog-box" @click.stop="1+1">
         <img :src="popBg">
         <div class="log1">
@@ -72,7 +70,7 @@
             <span>元</span>
           </div>
           <div @click="toLuckDraw()">
-            您有一份福利待领取！去领取
+            您有一次抽奖机会，立即前往
             <i class="iconfont icon-you"></i>
           </div>
           <img class="present" :src="presentClose">
@@ -83,7 +81,7 @@
     <div class="other-end" v-if="status == 5">
       <div class="box">
         <p>您的好友已砍价至0元，</p>
-        <p>获得免费拍照机会！</p>
+        <p>感谢您的参与</p>
         <div @click="$router.push({name:'supportMain'})">我也要报名</div>
       </div>
     </div>
@@ -125,7 +123,8 @@ export default {
       showDailog: false,
       showPage: false,
       seconds: 0,
-      time: 0
+      time: 0,
+      recordid: ''
     }
   },
   computed: {
@@ -133,7 +132,8 @@ export default {
       userInfo: item => item.userInfo,
       game: item => item.game,
       recordInfo: item => item.recordInfo,
-      list: item => item.supports
+      list: item => item.supports,
+      recordUser: item => item.recordUser
     }),
     countdown () {
       if (this.status != 3 && this.time >= 0) {
@@ -141,35 +141,35 @@ export default {
         let minutes = 59 - new Date().getMinutes()
         let seconds = 59 - new Date().getSeconds()
         return `<span style='color:#fff;'>砍价倒计时</span>
-        <span style='padding: 0 0.03rem;background: #5e5e5e;color: #fff;border-radius:4px;'>${hour > 9 ? hour : '0' + hour}</span>
+        <span style='padding: 0.02rem 0.03rem 0;background: #5e5e5e;color: #fff;border-radius:4px;'>${hour > 9 ? hour : '0' + hour}</span>
         <span style='color:#fff;'>:</span>
-        <span style='padding: 0 0.03rem;background: #5e5e5e;color: #fff;border-radius:4px;'>${minutes > 9 ? minutes : '0' + minutes}</span>
+        <span style='padding: 0.02rem 0.03rem 0;background: #5e5e5e;color: #fff;border-radius:4px;'>${minutes > 9 ? minutes : '0' + minutes}</span>
         <span style='color:#fff;'>:</span>
-        <span style='padding: 0 0.03rem;background: rgba(255, 66, 28, 1);color: #fff;border-radius:4px;'>${seconds > 9 ? seconds : '0' + seconds}</span>`
+        <span style='padding: 0.02rem 0.03rem 0;background: rgba(255, 66, 28, 1);color: #fff;border-radius:4px;'>${seconds > 9 ? seconds : '0' + seconds}</span>`
       } else {
         let hour = '00'
         let minutes = '00'
         let seconds = '00'
         return `<span style='color:#fff;'>活动已结束</span>
-        <span style='padding: 0 0.03rem;background: #5e5e5e;color: #fff;border-radius:4px;'>${hour}</span>
+        <span style='padding: 0.02rem 0.03rem 0;background: #5e5e5e;color: #fff;border-radius:4px;'>${hour}</span>
         <span style='color:#fff;'>:</span>
-        <span style='padding: 0 0.03rem;background: #5e5e5e;color: #fff;border-radius:4px;'>${minutes}</span>
+        <span style='padding: 0.02rem 0.03rem 0;background: #5e5e5e;color: #fff;border-radius:4px;'>${minutes}</span>
         <span style='color:#fff;'>:</span>
-        <span style='padding: 0 0.03rem;background: rgba(255, 66, 28, 1);color: #fff;border-radius:4px;'>${seconds}</span>`
+        <span style='padding: 0.02rem 0.03rem 0;background: rgba(255, 66, 28, 1);color: #fff;border-radius:4px;'>${seconds}</span>`
       }
     }
   },
   created () {
     this.getGame().then(() => {
-      if (!this.$route.query.recordid) {
-        this.getRecord(this.game.record.RecordId).then(() => {
-          this.checkStatus()
-          // this.share(this.game.record.RecordId)
+      if (this.$route.params.recordid == 0) {
+        this.recordid = this.game.record.RecordId
+        this.getRecord(this.recordid).then(() => {
+          this.share(this.recordid)
         })
       } else {
-        this.getRecord(this.game.record.RecordId).then(() => {
-          // this.share(this.$route.query.recordid)
-          this.checkStatus()
+        this.recordid = this.$route.params.recordid
+        this.getRecord(this.recordid).then(() => {
+          this.share(this.recordid)
         })
       }
     })
@@ -180,7 +180,7 @@ export default {
   methods: {
     ...mapIndexActions(['getGame', 'getRecord', 'setSupport']),
     checkStatus () {
-      if (this.$route.query.other === 'other') {
+      if (this.$route.params.other === 'other') {
         this.status = 2
         this.btnText = '立即助力TA'
         if (this.list.length >= this.game.game.UserNum) {
@@ -196,34 +196,39 @@ export default {
       if (now > end) {
         this.status = 3
         this.btnText = '立即助力TA'
-      } else if (this.game.note.LeftNum <= 0 && !this.$route.query.other) {
+      } else if (this.game.note.LeftNum <= 0 && this.$route.params.other != 'other') {
         this.status = 6
       }
       this.showPage = true
     },
     share (recordid) {
+      let link = `${window.location.origin}${window.location.pathname}#/supportDetail/other/${recordid}`
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '城的空间',
         desc: '城的空间',
-        link: `${window.location.origin}${window.location.pathname}#/supportDetail?other=other&recordid=${recordid}`,
+        link: link,
         thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+      }).then(() => {
+        setTimeout(() => {
+          this.checkStatus()
+        }, 200)
       })
     },
     support () {
       if (this.status === 1) {
         this.$toast('微信右上角分享，让好友帮你助力哦！')
       } else if (this.status === 2) {
-        this.setSupport({ customerid: this.userInfo.CustomerId, recordid: this.$route.query.recordid }).then(() => {
-          this.showDailog = true
-        }).catch(() => {
-          this.showDailog = true
+        this.setSupport({ customerid: this.userInfo.CustomerId, recordid: this.$route.params.recordid }).then(() => {
+          this.getRecord(this.recordid).then(() => {
+            this.showDailog = true
+          })
         })
       } else if (this.status === 3) {
         this.$toast('活动已结束')
       }
     },
     toLuckDraw () {
-
+      window.location.href = 'http://dev.jinchengjiaye.com/game/luckdraw/#/?lotteryId=2557197b-3a49-4067-b52c-97fdd2c93edc'
     }
   }
 }
@@ -379,6 +384,7 @@ export default {
 .top {
   img {
     width: 100%;
+    height: 2.5rem;
   }
   .top-div {
     padding: 0.1rem 0.18rem;
@@ -439,7 +445,7 @@ export default {
       background: rgba(252, 98, 67, 1);
       border-radius: 2px;
       color: #fff;
-      padding: 0.02rem 0.08rem;
+      padding: 0.04rem 0.08rem 0.02rem;
       margin-right: 0.2rem;
       font-size: 0.13rem;
     }

src/views/supportMain/supportMain.vue

@@ -4,9 +4,9 @@
       <div class="top">
         <img :src="topImg">
         <div class="top-div">
-          <b>{{game.game.GameName}}</b>
+          <b>悦见山全家福拍摄助力砍价活动</b>
           <p>时间: {{`${this.toolClass.dateFormat(game.game.BeginDate,'yyyy年MM月dd日')} ~ ${this.toolClass.dateFormat(game.game.EndDate,'yyyy年MM月dd日')}`}}</p>
-          <p>地点: 南京悦见山G99</p>
+          <p>地点: 南京•国家级江北新区•白马路10号</p>
         </div>
       </div>
       <div class="main">
@@ -15,14 +15,13 @@
         <p>原价：888元</p>
         <p>可邀请最多30个好友帮忙砍价，最多可砍至0元</p>
         <div>套餐包含：</div>
-        <div>10寸专属定制水晶PVC相册1本（入册15张）</div>
-        <div>10寸复古精美摆台1幅</div>
-        <div>拍摄精修：拍摄至少60张，精修入册15张</div>
+        <div>服装提供：免费提供1组拍摄服装</div>
+        <div>拍摄精修：拍摄至少12张有效照片，精修刻盘</div>
+        <div>台历赠送：选取6张精修照片定制2019年新年台历（具体台历形式由悦见山统一定制）</div>
         <p>照片赠送：照片全送</p>
+        <div>活动规则：</div>
+        <p>本次活动共招募1212组家庭，每天报名砍价成功人数不得超过10组。</p>
         <p>活动电话：025-86426677</p>
-        <p>服务案场：银城悦见山G99</p>
-        <p>地址：江宁区秣陵街道创新东路2号</p>
-        <p>*活动最终解释权归银城蓝溪郡开发商所有</p>
       </div>
     </div>
     <div class="bottom">
@@ -43,20 +42,11 @@
         </div>
         <div class="item">
           <label for="address">住址</label>
-          <div @click="showArea = true">{{address}}</div>
+          <input type="text" v-model="address">
         </div>
-        <textarea name="addressDetail" rows="5" placeholder="详细地址" v-model="adderssDetail"></textarea>
         <div class="submit" @click="sign()">提交</div>
       </div>
     </div>
-    <van-area
-      class="area"
-      :value="'320100'"
-      :area-list="area"
-      @confirm="confirm"
-      @cancel="cancel"
-      v-if="showArea"
-    />
   </div>
 </template>
 
@@ -114,13 +104,6 @@ export default {
   },
   methods: {
     ...mapIndexActions(['getGame', 'signUp', 'setRecord']),
-    confirm (val) {
-      this.address = `${val[0].name},${val[1].name},${val[2].name}`
-      this.showArea = false
-    },
-    cancel () {
-      this.showArea = false
-    },
     submit () {
       if (this.userInfo.Phone) {
         this.record()
@@ -138,10 +121,8 @@ export default {
       } else if (!this.address) {
         this.$toast('地址为必填项')
         return
-      } else if (!this.adderssDetail) {
-        this.$toast('详细地址为必填项')
-        return
       }
+      this.login = false
       let data = {
         name: this.name,
         phone: this.phone,
@@ -154,10 +135,10 @@ export default {
     record () {
       if (this.btn.status === 1) {
         this.setRecord().then(() => {
-          this.$router.push({ name: 'supportDetail' })
+          this.$router.push({ name: 'supportDetail', params: { other: 'own', recordid: '0' } })
         })
       } else if (this.btn.status === 3) {
-        this.$router.push({ name: 'supportDetail' })
+        this.$router.push({ name: 'supportDetail', params: { other: 'own', recordid: '0' } })
       }
     }
   }
@@ -165,16 +146,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.area {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 1001;
-  width: 100%;
-}
 .top {
   img {
     width: 100%;
+    height: 2.5rem;
   }
   .top-div {
     padding: 0.12rem 0.25rem;