fix(*): use globalData

package.json

@@ -53,6 +53,7 @@
     "@dcloudio/uni-quickapp-native": "^2.0.0-28820200820001",
     "@dcloudio/uni-quickapp-webview": "^2.0.0-28820200820001",
     "@dcloudio/uni-stat": "^2.0.0-28820200820001",
+    "@types/weixin-app": "^2.9.1",
     "@vue/shared": "^3.0.0-rc.4",
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",

src/App.vue

@@ -3,10 +3,11 @@
  * @Author: Steven
  * @Date: 2020-08-26 16:08:15
  * @LastEditors: Steven
- * @LastEditTime: 2020-09-09 09:54:18
+ * @LastEditTime: 2020-09-15 11:25:46
 -->
 <script lang="ts">
 import Vue from "vue"
+
 export default Vue.extend({
   mpType: "app",
   onLaunch() {
@@ -20,6 +21,10 @@ export default Vue.extend({
   },
   globalData: {
     baseurl: "huadongio.com",
+    activities: [],
+    currentActId: 0,
+    items: [],
+    currentItemId: 0,
   },
 })
 </script>

src/components/vote-detail/vote-detail.vue

@@ -15,22 +15,24 @@
 <script lang="ts">
 import Vue from "vue"
 import mainTitle from "@/components/main-title/main-title.vue"
+
 export default Vue.extend({
+  props: {
+    activity: {
+      type: Object,
+      required: true
+    },
+  },
   components: {
     mainTitle,
   },
   data() {
     return {
-      activity: {
-        desc: `2019，怎样才能在众多商户中脱颖而出?家家传媒给大家送福利来了!不管您经营的是餐饮、酒店、休闲娱乐，钻石珠宝,家装建材，婚庆影楼，还是家电数码，母婴，商行超市，农资特产，教育培训，品牌服务，广告设计，微店，制作业等……，只要您是石脑镇的商家，均可报名！我们的目的只有一个，利用互联网各种线上宣传形式，为商家推广，营销制作人气，提高市场关注度，增加商家的进店曝光率！温馨提示
-      每个微信号每天可投3票，给同一选手一天限投一票。本活动重在参与，意在宣传推广，我们不提倡赠送礼物，赠送礼物属自愿行为，如有疑问请联系我们的在线客服奖项设置关于作弊
-      活动方有权对票数异常的选手做出相应处罚，作弊违规行为包括但不限于：使用辅助软件的作弊行为、网上买僵尸号的投票行为、找投票公司付费投票行为。第一次电话口头警告并减去相关的票数，第二次再出现类似情况，不再另行通知，票数系统将自动清零，严重者取消参评资格和获奖资格。
-      活动重在参与，意在宣传推广，打赏属自愿行为，我们不提倡给选手打赏，请酌情购买，主办方对本活动保留最终解释权！.`,
-      },
       title: "活动详情",
     }
   },
-  onLoad() {},
+  onLoad() {
+  },
   methods: {},
 })
 </script>

src/components/vote-list/vote-list.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <view class="text-gray-100">
-    <view v-if="!isIndex">
+    <view v-if="!isVoteItem">
       <view class="flex w-4-5 px-2 m-auto text-orange-500 text-center">
         <view class="flex-1">排名</view>
         <view class="flex-1">编号</view>
@@ -16,7 +16,7 @@
       </view>
     </view>
 
-    <view class="flex flex-row flex-wrap w-full justify-center" v-if="isIndex">
+    <view class="flex flex-row flex-wrap w-full justify-center" v-if="isVoteItem">
       <block v-for="item in items" :key="item.id">
         <vote-item
           :item="item"
@@ -45,7 +45,7 @@ export default Vue.extend({
   },
   props: {
     items: Array,
-    pageType: String,
+    itemType: String,
   },
   onLoad() {},
   methods: {
@@ -57,8 +57,8 @@ export default Vue.extend({
     voteItem,
   },
   computed: {
-    isIndex(): Boolean {
-      return this.pageType === "index"
+    isVoteItem(): Boolean {
+      return this.itemType === "vote"
     },
   },
 })

src/pages/desc/desc.vue

@@ -3,13 +3,13 @@
  * @Author: Steven
  * @Date: 2020-09-08 08:45:00
  * @LastEditors: Steven
- * @LastEditTime: 2020-09-09 16:46:12
+ * @LastEditTime: 2020-09-15 13:28:45
 -->
 <template>
   <view class="bg-purple pt-2">
     <title></title>
-    <vote-rule></vote-rule>
-    <vote-detail></vote-detail>
+    <vote-rule :activity="activity"></vote-rule>
+    <vote-detail :activity="activity"></vote-detail>
     <vote-footer></vote-footer>
   </view>
 </template>
@@ -20,11 +20,23 @@ import title from "@/components/title/title.vue"
 import voteRule from "@/components/vote-rule/vote-rule.vue"
 import voteDetail from "@/components/vote-detail/vote-detail.vue"
 import voteFooter from "@/components/footer/footer.vue"
+import {Iactivity} from "@/common/interface";
+
 export default Vue.extend({
   data() {
-    return {}
+    return {
+      activity: {},
+      actId: 0,
+    }
+  },
+  onLoad() {
+    const {activities, currentActId}: any = getApp().globalData;
+    this.actId = currentActId
+    this.activity = activities.filter(
+        (el: Iactivity) => el.id === this.actId
+    )[0]
+    console.log(this.activity)
   },
-  onLoad() {},
   methods: {},
   components: {
     title,

src/pages/home/home.vue

@@ -3,23 +3,23 @@
  * @Author: Steven
  * @Date: 2020-09-14 09:15:23
  * @LastEditors: Steven
- * @LastEditTime: 2020-09-15 10:50:03
+ * @LastEditTime: 2020-09-15 13:22:00
 -->
 <template>
   <view class="text-gray-900 p-2">
     <view
-      v-for="activity in activities"
-      :key="activity.id"
-      class="my-2 text-center text-gray-500 rounded shadow"
+        v-for="activity in activities"
+        :key="activity.id"
+        class="my-2 text-center text-gray-500 rounded shadow"
     >
       <navigator
-        :url="'/pages/index/index?id=' + activity.id"
-        open-type="reLaunch"
+          :url="'/pages/index/index?id=' + activity.id"
+          open-type="reLaunch"
       >
         <image
-          :src="activity.bannerImg[0]"
-          mode="widthFix"
-          class="rounded rounded-b-none w-full"
+            :src="activity.bannerImg[0]"
+            mode="widthFix"
+            class="rounded rounded-b-none w-full"
         ></image>
         <view class="p-2 text-left">
           <view>{{ activity.name }}</view>
@@ -40,27 +40,26 @@
 
 <script lang="ts">
 import Vue from "vue"
-import { activities } from "@/mock/store"
-import { getActivities } from "@/servise/activates"
+import {activities} from "@/mock/store"
+import {getActivities} from "@/servise/activates"
+
 export default Vue.extend({
   data() {
     return {
       activities,
+      userInfo: {},
     }
   },
 
   onLoad() {
-    // 1. 获取授权用户信息
-    // 2. 服务器接口获取活动信息
-    // 3. 用户信息，活动信息存入globaldata
-    // 4. 跳转投票首页参数传入活动id
-    this._getUserInfo()
+    // 1. 服务器接口获取活动信息
+    // 2. 活动信息存入globaldata
+    // 3. 跳转投票首页参数传入活动id
     this._getActivities()
+    let globalData: any = getApp().globalData
+    globalData.activities = this.activities
   },
   methods: {
-    // FIXME 获取授权用户信息
-    _getUserInfo() {
-    },
     // 获取活动信息
     async _getActivities() {
       try {

src/pages/index/index.vue

@@ -3,7 +3,7 @@
  * @Author: Steven
  * @Date: 2020-08-26 16:08:15
  * @LastEditors: Steven
- * @LastEditTime: 2020-09-15 10:47:30
+ * @LastEditTime: 2020-09-15 13:25:05
 -->
 <template>
   <view class="bg-purple">
@@ -40,7 +40,7 @@
     <!-- 搜索区域 -->
     <search-bar></search-bar>
     <!-- 项目列表区域 -->
-    <vote-list :items="items" :pageType="pageType"></vote-list>
+    <vote-list :items="items" :itemType="itemType"></vote-list>
     <!-- 脚注区域 -->
     <vote-footer :content="activity.slogan"></vote-footer>
   </view>
@@ -57,7 +57,7 @@ import voteList from "@/components/vote-list/vote-list.vue"
 import voteFooter from "@/components/footer/footer.vue"
 import request from "@/utils/request"
 import { getActivity } from "@/servise/activates"
-import { getItems } from "@/servise/items";
+import { getItems } from "@/servise/items"
 import { items, activities } from "@/mock/store"
 export default Vue.extend({
   data() {
@@ -65,7 +65,7 @@ export default Vue.extend({
       items,
       activity: {},
       lastdate: "2天",
-      pageType: "index",
+      itemType: "vote",
       display: false,
     }
   },
@@ -79,6 +79,9 @@ export default Vue.extend({
     this._getActivity(query)
     // 2. 下载选手信息
     this._getItems()
+    // 3. 存入当前活动id
+    let globalData: any = getApp().globalData
+    globalData.currentActId = +query?.id
   },
   methods: {
     // FIXME 获取活动信息

yarn.lock

@@ -1779,6 +1779,11 @@
     "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
+"@types/weixin-app@^2.9.1":
+  version "2.9.1"
+  resolved "https://registry.npm.taobao.org/@types/weixin-app/download/@types/weixin-app-2.9.1.tgz#bcfdc6cbfb070f2b9c1416f9cd93f2bd72c65c1a"
+  integrity sha1-vP3Gy/sHDyucFBb5zZPyvXLGXBo=
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.npm.taobao.org/@types/yargs-parser/download/@types/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"