merge

src/App.vue

@@ -12,6 +12,15 @@ export default Vue.extend({
   mpType: "app",
   onLaunch() {
     console.log("App Launch")
+    uni.login({
+      provider: "weixin",
+      success: loginRes => {
+        console.log("微信登录返回信息", loginRes)
+      },
+      fail: err => {
+        console.error("微信登录错误信息", err)
+      }
+    })
   },
   onShow() {
     console.log("App Show")

src/common/interface.ts

@@ -5,32 +5,55 @@
  * @LastEditors: Steven
  * @LastEditTime: 2020-09-15 10:26:27
  */
+
 // 属性
 export interface Iinfo {
-  name: string // 属性名称
-  value: number // 属性值
+    // 属性名称
+    name: string
+    // 属性值
+    value: number
 }
+
 // 选手
 export interface Iitem {
-  id: number // 选手编号
-  name: string // 选手名称
-  img: string // 选手图片
-  company?: string // 选手公司
-  group?: string // 选手分组
-  show?: string // 选手风采
-  desc: string // 选手简介
-  stats: Iinfo[] // 统计信息
+    // 选手编号
+    id: number
+    // 选手名称
+    name: string
+    // 选手图片
+    img: string
+    // 选手公司
+    company?: string
+    // 选手分组
+    group?: string
+    // 选手风采
+    show?: string
+    // 选手简介
+    desc: string
+    // 统计信息
+    stats: Iinfo[]
 }
+
 // 活动
 export interface Iactivity {
-  id: number // 活动编号
-  name: string //活动名称
-  bannerImg: string[] //广告图片
-  startTime: string //开始时间
-  endTime: string //结束时间
-  rule: Iinfo[] // 活动规则
-  desc: string //活动描述
-  status: "ONGOING" | "ENDED" | "ISCOMING" // 活动状态
-  slogan: string // 口号，标语
-  stats: Iinfo[] // 统计信息
+    // 活动编号
+    id: number
+    //活动名称
+    name: string
+    //广告图片
+    bannerImg: string[]
+    //开始时间
+    startTime: string
+    //结束时间
+    endTime: string
+    // 活动规则
+    rule: Iinfo[]
+    //活动描述
+    desc: string
+    // 活动状态
+    status: "ONGOING" | "ENDED" | "ISCOMING"
+    // 口号，标语
+    slogan: string
+    // 统计信息
+    stats: Iinfo[]
 }

src/mock/store.ts

@@ -207,8 +207,8 @@ export const activities: Array<Iactivity> = [
     bannerImg: [
       "https://www.huotoupiao.com/assets/www/ActivityPc2/img/tem2.jpg",
     ], //广告图片
-    startTime: "2020-09-15 01:00", //开始时间
-    endTime: "2020-12-01 01:00", //结束时间
+    startTime: "2020-09-15 00:00", //开始时间
+    endTime: "2020-10-11 00:00", //结束时间
     rule: [
       {
         name: "每个微信号每天可以投",
@@ -250,8 +250,8 @@ export const activities: Array<Iactivity> = [
     bannerImg: [
       "https://www.huotoupiao.com/assets/www/ActivityPc2/img/tem2.jpg",
     ], //广告图片
-    startTime: "2020-09-01 01:00", //开始时间
-    endTime: "2020-09-14 01:00", //结束时间
+    startTime: "2020-09-01 00:00", //开始时间
+    endTime: "2020-09-15 00:00", //结束时间
     rule: [
       {
         name: "每个微信号每天可以投",
@@ -275,15 +275,15 @@ export const activities: Array<Iactivity> = [
     stats: [
       {
         name: "参与人数",
-        value: 0,
+        value: 100,
       },
       {
         name: "累计票数",
-        value: 0,
+        value: 23000,
       },
       {
         name: "累计访问",
-        value: 0,
+        value: 560000,
       },
     ], // 统计信息
   },

src/pages/detail/detail.vue

@@ -29,7 +29,7 @@
     </view>
 
     <!-- 风采展示 -->
-    <sub-title :content="title2"></sub-title>
+    <sub-title v-if="item.show!==undefined" :content="title2"></sub-title>
     <detail-video></detail-video>
     <!-- 选手简介 -->
     <sub-title :content="title3"></sub-title>
@@ -134,7 +134,7 @@ export default Vue.extend({
           uni.getUserInfo({
             provider: "weixin",
             success: infoRes => {
-              console.log("用户信息为：",infoRes)
+              console.log("用户信息为：", infoRes)
             }
           })
         }

src/pages/index/index.vue

@@ -14,23 +14,21 @@
     <!-- 统计区域 -->
     <stats :content="activity.stats">
       <view
-          class="mt-2 p-2 text-gray-100 text-center diff-time-box flex justify-center"
+        class="mt-2 p-2 text-gray-100 text-center diff-time-box flex justify-center"
       >
-        <block v-if="!(activity.status==='ENDED')">
-          活动{{ label }}时间还有
+        <block v-if="!(activity.status === 'ENDED')">
+          {{ msg }}
           <uni-countdown
-              color="#fff"
-              background-color=""
-              splitorColor="#fff"
-              :day="day"
-              :hour="hour"
-              :minute="min"
-              :second="sec"
+            color="#fff"
+            background-color=""
+            splitorColor="#fff"
+            :day="day"
+            :hour="hour"
+            :minute="min"
+            :second="sec"
           ></uni-countdown>
         </block>
-        <block v-else>
-          活动已经结束
-        </block>
+        <block v-else>{{ msg }}</block>
       </view>
     </stats>
     <!-- 规则区域 -->
@@ -72,9 +70,9 @@ import searchBar from "@/components/search-bar/search-bar.vue"
 import voteList from "@/components/vote-list/vote-list.vue"
 import voteFooter from "@/components/footer/footer.vue"
 import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
-import {getActivity} from "@/servise/activates"
-import {getItems} from "@/servise/items"
-import {activities, items} from "@/mock/store"
+import { getActivity } from "@/servise/activates"
+import { getItems } from "@/servise/items"
+import { activities, items } from "@/mock/store"
 import moment from "moment"
 
 moment().locale("zh-cn")
@@ -89,7 +87,7 @@ export default Vue.extend({
       sec: 30,
       itemType: "vote",
       display: false,
-      label: "开始",
+      msg: "活动已经结束",
     }
   },
   async onLoad(query) {
@@ -107,26 +105,20 @@ export default Vue.extend({
     globalData.currentActId = +query?.id
     // 4. 计算时间
     // 获取活动时间
-    let {startTime, endTime}: any = this.activity
+    let { startTime, endTime, status }: any = this.activity
     //  获取当前时间
     console.log(startTime, endTime)
     let now = moment()
     startTime = moment(startTime)
     endTime = moment(endTime)
-    console.log(`now:${now}, startTime:${startTime}, endTime:${endTime}`)
-    //  判断当前时间是在开始前还是进行中还是结束后
-    let {status}: any = this.activity
+    let duration = moment.duration(now.diff(startTime))
+    // 根据状态显示不同内容
     if (status === "ISCOMING") {
-      this.label = "开始"
-    //  开始还有多久
-      let beforeStart = moment.duration(now.diff(startTime))
-      console.log(beforeStart)
+      this.msg = "活动开始还有"
     } else if (status === "ONGOING") {
-      this.label = "结束"
-    } else {
-      this.label = "活动已经结束"
+      this.msg = "活动结束还有"
     }
-
+    console.log(`now:${now}, startTime:${startTime}, endTime:${endTime}`)
   },
   methods: {
     // FIXME 获取活动信息