improvement: 优化

src/app.wpy

@@ -76,7 +76,6 @@ wepy.app({
       'pages/myraffles',
       'pages/help',
       'pages/morehelp',
-      'pages/awards',
     ],
     window: {
       backgroundTextStyle: 'light',

src/components/custom/openAnimation.wpy

@@ -40,7 +40,7 @@
             </div>
             <div class="dialog-footer">
               <button class="btn" @tap="go">立即查看</button>
-              <button class="btn" @tap="go">再次挑战</button>
+              <button class="btn" @tap="hideAnimation">再次挑战</button>
             </div>
           </div>
         </div>
@@ -84,9 +84,15 @@
           }, 500);
         }, 2000);
       },
+      hideAnimation (){
+        this.showAnimation = false;
+      },
       go() {
         this.showAnimation = false;
+        //如果得奖了走
         wx.navigateTo({url:'/pages/prize'})
+        //如果没得奖走
+        //wx.navigateTo({url:'/pages/myraffles'})
       }
     },
     created() {

src/components/custom/popup.wpy

@@ -20,8 +20,8 @@
     },
     data: {
       menus: [
-        { img: '/static/images/awards@2x.png', title: '我的抽奖', path: '/pages/awards' },
-        { img: '/static/images/feedback@2x.png', title: '规则与帮助', path: '/pages/feedback' },
+        { img: '/static/images/awards@2x.png', title: '我的抽奖', path: '/pages/myraffles' },
+        { img: '/static/images/feedback@2x.png', title: '规则与帮助', path: '/pages/help' },
         { img: '/static/images/help@2x.png', title: '问题反馈', path: '/pages/help' }
       ],
       show: false,

src/pages/awards.wpy

-<style lang="less">
-
-</style>
-<template>
-  <view>我的抽奖</view>
-</template>
-<script>
-  import wepy from '@wepy/core';
-
-  wepy.page({
-
-  });
-</script>

src/pages/feedback.wpy

-<style lang="less">
-
-</style>
-<template>
-  <view>问题反馈</view>
-</template>
-<script>
-  import wepy from '@wepy/core';
-
-  wepy.page({
-
-  });
-</script>

src/pages/index.wpy

@@ -168,7 +168,6 @@
 </wxs>
 <template>
   <view class="video-wrapper">
-    <van-dialog id="van-dialog" />
     <view id="myvideo">
       <van-notify id="van-notify" />
       <video-list :videoList.sync="videoList" :total="total" bindchange="changeVideo">
@@ -244,7 +243,6 @@
   import store from '../store';
   import { mapState, mapActions } from '@wepy/x';
   import wepy from '@wepy/core';
-  import Dialog from '../components/vant/dialog/dialog';
   import Notify from '../components/vant/notify/notify';
   wepy.page({
     store,
@@ -521,6 +519,10 @@
           url: '/pages/raffle?id=1&progress=70&chance=1/780&corn=50000&imgsrc=/static/images/test2.png&goods=Nintendo Switch任天堂游戏机任天堂游戏机'
         });
 //        this.awards = !this.awards;
+      },
+      showMenu: function(v) {
+        console.log(v);
+        this.showMenus = v;
       }
     },
 
@@ -623,7 +625,6 @@
       'van-button': '../components/vant/button/index',
       'video-list': '~@/components/custom/videolist',
       'van-icon': '../components/vant/icon/index',
-      'van-dialog': '../components/vant/dialog/index',
       'video-sign': '~@/components/custom/sign',
       'video-gold': '~@/components/custom/sign',
       'video-share': '~@/components/custom/sign',

src/pages/myraffles.wpy

 <style lang="less">
+  .raffles-list{
+    padding-bottom:30rpx;
+  }
   .raffle-item{
     background-color: #fff;
     padding:30rpx 0 0 30rpx;
@@ -63,45 +66,27 @@
     }
   }
 </style>
+<wxs module="prize">
+  function computClass (status) {
+    var cls=['','green','grey','','red','red'];
+    var index = status.value || 0;
+    console.log(status)
+    return cls[index]
+  };
+  module.exports = {
+    computClass:computClass
+  }
+</wxs>
 <template>
   <view class="raffles-list">
-    <view class="raffle-item">
-      <image src="/static/images/test1.jpg" class="item-img"></image>
-      <view class="item-right">
-        <view class="item-title">Nintendo Switch任天堂游戏机任天堂游戏机</view>
-        <view class="item-corn">花费: 500克币</view>
-        <view class="item-status">
-          <button class="item-button">领取</button>
-        </view>
-      </view>
-    </view>
-    <view class="raffle-item">
-      <image src="/static/images/test1.jpg" class="item-img"></image>
+    <view class="raffle-item" wx:for="{{list}}" wx:key="index">
+      <image src="{{item.prize.photoUrl}}" class="item-img"></image>
       <view class="item-right">
-        <view class="item-title">Nintendo Switch任天堂游戏机任天堂游戏机</view>
-        <view class="item-corn">花费: 500克币</view>
+        <view class="item-title">{{item.prize.name}}</view>
+        <view class="item-corn">花费: {{item.quantity}}克币</view>
         <view class="item-status">
-          <text class="grey">未中奖</text>
-        </view>
-      </view>
-    </view>
-    <view class="raffle-item">
-      <image src="/static/images/test1.jpg" class="item-img"></image>
-      <view class="item-right">
-        <view class="item-title">Nintendo Switch任天堂游戏机任天堂游戏机</view>
-        <view class="item-corn">花费: 500克币</view>
-        <view class="item-status">
-          <text class="red">已发货</text>
-        </view>
-      </view>
-    </view>
-    <view class="raffle-item">
-      <image src="/static/images/test1.jpg" class="item-img"></image>
-      <view class="item-right">
-        <view class="item-title">Nintendo Switch任天堂游戏机任天堂游戏机</view>
-        <view class="item-corn">花费: 500克币</view>
-        <view class="item-status">
-          <text class="green">待开奖</text>
+          <button data-id="{{item.id}}" class="item-button" bindtap="goprize"  v-if="item.status.value==3">领取</button>
+          <text class="{{prize.computClass(item.status)}}" v-else>{{item.status.name}}</text>
         </view>
       </view>
     </view>
@@ -114,10 +99,20 @@
       list:[]
     },
     methods: {
-
+      goprize(event) {
+        let detail = event.$wx.currentTarget;
+        let id = detail.dataset.id || ''
+        wx.navigateTo({url:'/pages/prize?prizeid='+id});
+      }
     },
     onLoad (query) {
-
+      this.list = [
+        {id:1,status:{name:'待开奖',value:1},quantity:500,prize:{name:'Nintendo Switch任天堂游戏机任天堂游戏机',photoUrl:'/static/images/test1.jpg'}},
+        {id:2,status:{name:'未中奖',value:2},quantity:200,prize:{name:'Nintendo Switch任天堂游戏机任天堂游戏机',photoUrl:'/static/images/test1.jpg'}},
+        {id:3,status:{name:'待领取',value:3},quantity:300,prize:{name:'Nintendo Switch任天堂游戏机任天堂游戏机',photoUrl:'/static/images/test1.jpg'}},
+        {id:4,status:{name:'未发货',value:4},quantity:400,prize:{name:'Nintendo Switch任天堂游戏机任天堂游戏机',photoUrl:'/static/images/test1.jpg'}},
+        {id:5,status:{name:'已发货',value:5},quantity:500,prize:{name:'Nintendo Switch任天堂游戏机任天堂游戏机',photoUrl:'/static/images/test1.jpg'}},
+        ];
     },
   });
 </script>

src/pages/prize.wpy

@@ -58,6 +58,9 @@
       font-size: 30rpx;
     }
   }
+  .van-picker .van-picker__cancel,.van-picker .van-picker__confirm{
+    color:#FF5D15;
+  }
 </style>
 <template>
   <view class="prize-wrapper">
@@ -83,11 +86,14 @@
     <view class="footer">
       <button class="getprize" bindtap="goprize">领取</button>
     </view>
+    <van-dialog id="van-dialog" confirmButtonColor="#FF5D15"/>
+    <van-notify id="van-notify" />
   </view>
 </template>
 <script>
   import wepy from '@wepy/core';
   import Dialog from '../components/vant/dialog/dialog';
+  import Notify from '../components/vant/notify/notify';
   var area = require('../components/custom/china.js');
   wepy.page({
     data: {
@@ -101,6 +107,29 @@
     },
     methods: {
       goprize() {
+        if(!this.name){
+          Notify({message: '请填写收货人', background:'#FF5D15'});
+          return;
+        }
+        if(!this.phone){
+          Notify({message: '请填写手机号码', background:'#FF5D15'});
+          return;
+        }
+        if(!this.city){
+          Notify({message: '请选择所在地区', background:'#FF5D15'});
+          return;
+        }
+        if(!this.address){
+          Notify({message: '请填写详细地址', background:'#FF5D15'});
+          return;
+        }
+        Dialog.alert({
+          title: '领取成功',
+          message: '您所领取的奖品我们将在3到5个工作日内寄出，请您耐心等待，感谢您的参与!',
+        }).then(() => {
+          wx.reLaunch({url:'/pages/index'})
+          // on confirm
+        });
         console.log(this.name,this.phone,this.address);
       },
       onClose() {
@@ -132,7 +161,9 @@
       "van-field": "../components/vant/field/index",
       "van-cell": "../components/vant/cell/index",
       "van-area": "../components/vant/area/index",
-      "van-popup": "../components/vant/popup/index"
+      "van-popup": "../components/vant/popup/index",
+      'van-dialog': '../components/vant/dialog/index',
+      "van-notify": "../components/vant/notify/index"
     }
   }
 </config>

src/pages/raffle.wpy

@@ -157,20 +157,15 @@
         let detail = e.$wx.detail || {};
         //调用接口将加密数据传给后端，e.$wx.detail整体都传过去
         //如果数据得到了就跳转
-        console.log(detail,111)
         if(detail.encryptedData) {
-          Notify({message: '恭喜您参与成功!',background:'rgba(0,0,0,0.7)'})
-
+          Notify({message: '恭喜您参与成功!',background:'#FF5D15'})
         }else {
-          Notify({message: '参与失败，请重新授权!',background:'rgba(0,0,0,0.7)'})
+          Notify({message: '参与失败，请重新授权!',background:'#FF5D15'})
         }
       },
       joinin() {
         if(!this.isCheck) {
-          Notify({message: '请先勾选协议!', background:'#999'})
-          /*Dialog.alert({
-            message: '请先勾选协议！',
-          })*/
+          Notify({message: '请先勾选协议!', background:'#FF5D15'})
         }
       }
     },