fix #3

package.json

@@ -37,6 +37,7 @@
     "@babel/runtime": "^7.7.7",
     "@tarojs/cli": "^3.0.7",
     "@tarojs/components": "3.0.7",
+    "@tarojs/mini-runner": "^3.0.7",
     "@tarojs/runtime": "3.0.7",
     "@tarojs/taro": "3.0.7",
     "qs": "^6.9.4",

project.config.json

@@ -5,30 +5,30 @@
 	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
+		"scopeDataCheck": false,
+		"coverView": true,
 		"es6": false,
-		"enhance": false,
 		"postcss": false,
+		"compileHotReLoad": false,
 		"preloadBackgroundData": false,
 		"minified": false,
+		"autoAudits": false,
 		"newFeature": false,
-		"coverView": true,
+		"uglifyFileName": false,
+		"uploadWithSourceMap": true,
+		"useIsolateContext": true,
 		"nodeModules": false,
-		"autoAudits": false,
+		"enhance": false,
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false,
 		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		}
 	},
 	"compileType": "miniprogram",
 	"simulatorType": "wechat",

src/components/BannerSwiper/index.vue

@@ -4,7 +4,7 @@
       <block v-for="(item, index) in List" :key="index">
         <swiper-item>
           <view class="swiper-item">
-            <image mode="aspectFill" class="centerLabel" :src="item.image"></image>
+            <image mode="aspectFill" class="centerLabel" :src="item.image" @tap="LinkTo(item)"></image>
           </view>
         </swiper-item>
       </block>
@@ -28,6 +28,10 @@ export default {
     }
   },
   methods: {
+    LinkTo (item) {
+      if (item.srcId === null) return
+      wx.navigateTo({ url: `../../pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.srcId}`})
+    }
   }
 }
 </script>

src/components/GetUserIcon/index.vue

@@ -39,9 +39,9 @@ export default {
               scope: 'scope.userInfo',
               success () {
                 wx.getUserInfo({ // 授权成功时，获取用户信息
-                  success (res) {
-                    _that.EditUserInfo({ name: 'Icon', value: res.userInfo.avatarUrl })
-                    _that.EditUserInfo({ name: 'Name', value: res.userInfo.nickName })
+                  success (subRes) {
+                    _that.EditUserInfo({ name: 'Icon', value: subRes.userInfo.avatarUrl })
+                    _that.EditUserInfo({ name: 'Name', value: subRes.userInfo.nickName })
                   }
                 })
               }

src/pages/HuiAiXin/EnergyStory/index.vue

@@ -10,7 +10,7 @@
 
         <!-- 列表 -->
         <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`./StarOwnerDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>{{item.name}}</text>
               <text>副标题</text>
@@ -57,19 +57,8 @@ export default {
     ScrollY
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiAiXin/StarOwner/index.vue

@@ -10,7 +10,7 @@
 
         <!-- 列表 -->
         <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`./StarOwnerDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
             <view class="Img">
               <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
             </view>
@@ -51,19 +51,8 @@ export default {
     ScrollY
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiAiXin/index.vue

@@ -20,7 +20,7 @@
         <view class="ListContainer" v-if="PageStarList.length">
           <scroll-view scroll-x="true">
             <view class="List">
-              <navigator v-for="(item, index) in PageStarList" :key="index" :url="`./StarOwner/StarOwnerDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
+              <navigator v-for="(item, index) in PageStarList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
                 <view class="Img">
                   <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
                 </view>
@@ -41,7 +41,7 @@
           <navigator url="./EnergyStory/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
         </view>
         <view class="List" v-if="PageStoryList.length">
-          <navigator v-for="(item, index) in PageStoryList" :key="index" url="./EnergyStory/EnergyStoryDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
+          <navigator v-for="(item, index) in PageStoryList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>{{item.name}}</text>
               <text>副标题</text>

src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.vue

@@ -1,39 +1,56 @@
 <template>
   <view class="page ZiXunXiangQing">
-    
     <!-- 标题 -->
-    <view class="MainTitle">
-      <text>标题</text>
-      <text class="iconfont iconguanbi"></text>
+    <view class="MainTitle" v-if="Info !== null">
+      <text>{{Info.title}}</text>
+      <text class="iconfont iconguanbi" @tap="GoBack"></text>
     </view>
 
     <!-- 内容 -->
-    <view class="Container"></view>
-    
+    <view class="Container" v-if="Info !== null">
+      <image mode="widthFix" class="Img" :src="Info.thumb"></image>
+      <text>{{Info.content}}</text>
+    </view>
   </view>
 </template>
 
 <script>
-
+import { getCurrentInstance } from "@tarojs/taro"
+import { createNamespacedHelpers } from "vuex"
+const { mapActions: mapIndexActions } = createNamespacedHelpers("index")
 export default {
-  name: 'ZiXunXiangQing',
-  data () {
+  name: "ZiXunXiangQing",
+  data() {
     return {
-
+      CurrnetId: null,
+      Info: null
     }
   },
-  components: {
-  },
-  created () {
-    this.Init()
+  components: {},
+  created() {
+    this.CurrnetId = getCurrentInstance().router.params.id
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      "GetNewsDetail", // 获取资讯详情
+    ]),
+    Init() {
+      this.GetNewsDetail({
+        urlData: { id: this.CurrnetId }
+      }).then((res) => {
+        this.Info = res.data.data || null
+      })
+    },
+    GoBack () {
+      wx.navigateBack()
     }
-  }
+  },
 }
 </script>
 
 <style lang="scss">
-@import "page.scss";
+@import "page.scss"
 </style>

src/pages/HuiQuanYi/OwnersNews/NewsDetail/page.scss

@@ -33,5 +33,15 @@
     margin-top: 40px;
     padding: 0 20px;
     padding-bottom: 40px;
+    > image {
+      width: 100%;
+    }
+    > text {
+      display: block;
+      font-size: 28px;
+      line-break: 40px;
+      color: #666;
+      margin-top: 20px;
+    }
   }
 }

src/pages/HuiQuanYi/OwnersNews/index.vue

@@ -52,19 +52,8 @@ export default {
     ScrollY
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiQuanYi/index.vue

@@ -59,19 +59,8 @@ export default {
     BannerSwiper
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.vue

@@ -52,19 +52,8 @@ export default {
   },
   created () {
     this.CurrnetId = getCurrentInstance().router.params.id
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue

@@ -50,7 +50,7 @@
 
     <!-- 底部栏 -->
     <view class="Bottom flex-h">
-      <view class="flex-item">
+      <view class="flex-item" @tap="LinkTo('../../index')">
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huishenghuo.png"></image>
       </view>
       <view class="flex-item">
@@ -89,25 +89,21 @@ export default {
   },
   components: {
   },
+  onShareAppMessage () {
+    return {
+      title: this.ActivityInfo.shareTitle,
+      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}`,
+      imageUrl: this.ActivityInfo.shareImg
+    }
+  },
   created () {
     wx.showShareMenu({
       withShareTicket: true,
       menus: ['shareAppMessage', 'shareTimeline']
     })
     this.CurrnetId = getCurrentInstance().router.params.id
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {
@@ -138,6 +134,9 @@ export default {
         })
       })
     },
+    LinkTo (url) {
+      wx.switchTab({ url })
+    },
     ToJoin () { // 报名
       wx.navigateTo({ url: `./JoinIn/index?id=${this.ActivityInfo.activityId}` })
     },

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -77,19 +77,8 @@ export default {
     ScrollY
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -14,7 +14,9 @@
             <text>{{item.Month}}</text>
             <view>
               <view v-for="(subItem, subIndex) in item.List" :key="subIndex">
-                <navigator url="./PhotoDetail/index" hover-class="other-navigator-hover" class="Img"></navigator>
+                <view class="Img" @tap="CheckBigImg(subItem.imgUrl)">
+                  <image mode="aspectFill" class="centerLabel" :src="subItem.imgUrl"></image>
+                </view>
               </view>
             </view>
           </view>
@@ -22,6 +24,10 @@
       </view>
 
     </ScrollY>
+
+    <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
+      <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+    </view>
   </view>
 </template>
 
@@ -34,6 +40,8 @@ export default {
   name: 'HuoDongZhaoPianQiang',
   data () {
     return {
+      ShowBigImg: false,
+      BigImgUrl: null,
       PageList: [],
       PageData: {
         pageNum: 1,
@@ -41,13 +49,7 @@ export default {
       },
       HasNextPage: true,
       IsRefreshing: false,
-      DataLock: false,
-      List: [
-        { Month: '8月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '7月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '6月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '5月份', List: ['', '', '', '', '', '', '', '', '', ''] }
-      ]
+      DataLock: false
     }
   },
   computed: {
@@ -59,19 +61,8 @@ export default {
     ScrollY
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {
@@ -94,9 +85,24 @@ export default {
       this.EmptyPhotoList() // 清空照片墙列表
       this.ToGetPageList() // 获取列表
     },
+    CheckBigImg (url) { // 查看大图
+      this.BigImgUrl = url
+      this.ShowBigImg = true
+    },
     ToGetPageList () { // 获取列表
       this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
-        this.PageList = [...this.PhotoList]
+        let Arr = []
+        this.PhotoList.map((item) => {
+          let Year = new Date(item.createDate).getFullYear()
+          let Month = new Date(item.createDate).getMonth() + 1
+          Month = Month > 9 ? Month : `0${Month}`
+          if (Arr.length && `${Year}-${Month}` === Arr[Arr.length - 1].Month) {
+            Arr[Arr.length - 1].List.push({ ...item })
+          } else {
+            Arr.push({ Month: `${Year}-${Month}`, List: [{ ...item} ] })
+          }
+        })
+        this.PageList = Arr
         this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false

src/pages/HuiShengHuo/PhotoList/page.scss

@@ -2,6 +2,16 @@
   width: 100%;
   height: 100%;
   background: #fff;
+  >.BigImg {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.7);
+    overflow: hidden;
+  }
   .PhotoList {
     > .flex-h {
       padding: 0 20px;

src/pages/HuiShengHuo/index.vue

@@ -22,8 +22,8 @@
             <scroll-view scroll-x="true">
               <view class="List">
                 <view v-for="(item, index) in PhotoList" :key="index">
-                  <view>
-                    <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+                  <view @tap="CheckBigImg(item.imgUrl)">
+                    <image mode="aspectFill" class="centerLabel" :src="item.imgUrl"></image>
                   </view>
                 </view>
               </view>
@@ -59,6 +59,10 @@
         </view>
 
       </ScrollY>
+
+      <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
+        <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+      </view>
     </view>
   </BasicLayout>
 </template>
@@ -73,6 +77,8 @@ export default {
   name: 'HuiShengHuo',
   data () {
     return {
+      ShowBigImg: false,
+      BigImgUrl: null,
       PageActivityList: [],
       PagePhotoList: [],
       RequestNum: 0,
@@ -85,7 +91,7 @@ export default {
       IndexBanner: x => x.IndexBanner, // 首页banner
       PhotoList: x => x.PhotoList, // 照片墙列表
       ActivityList: x => x.ActivityList // 活动列表
-    }),
+    })
   },
   components: {
     ScrollY,
@@ -121,22 +127,26 @@ export default {
       this.PageActivityList = []
       this.PagePhotoList = []
       this.GetIndexBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'life' } }).then(() => { // 获取首页banner
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
+      })
+      this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
+        this.CheckRequestNum(3) // 判断请求接口个数
+      }).catch(() => {
+        this.CheckRequestNum(3) // 判断请求接口个数
       })
-      // this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取照片墙列表
-      //   this.CheckRequestNum(2) // 判断请求接口个数
-      // }).catch(() => {
-      //   this.CheckRequestNum(2) // 判断请求接口个数
-      // })
       this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取活动列表
         this.PageActivityList = [...this.ActivityList]
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       })
     },
+    CheckBigImg (url) { // 查看大图
+      this.BigImgUrl = url
+      this.ShowBigImg = true
+    },
     CheckRequestNum (num) { // 判断请求接口个数
       this.RequestNum += 1
       if (this.RequestNum >= num) {

src/pages/HuiShengHuo/page.scss

@@ -1,6 +1,17 @@
 .page.HuiShengHuo {
   width: 100%;
   height: 100%;
+  position: relative;
+  >.BigImg {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.7);
+    overflow: hidden;
+  }
   .Banner {
     width: 100%;
     padding-bottom: 38%;

src/pages/WoDe/index.vue

@@ -13,7 +13,7 @@
           <view class="flex-item">
             <navigator url="../SignIn/index" hover-class="other-navigator-hover" class="SiginIn" v-if="UserInfo === null || UserInfo.Phone === undefined || UserInfo.Phone === null">立即登录</navigator>
             <text v-else>{{UserInfo.Name}}</text>
-            <text v-else>{{UserInfo.Phone}}</text>
+            <text  v-if="!(UserInfo === null || UserInfo.Phone === undefined || UserInfo.Phone === null)">{{UserInfo.Phone}}</text>
           </view>
         </view>
       </view>
@@ -28,13 +28,13 @@
         <text class="flex-item">我的报名</text>
         <text class="iconfont iconjiantouright"></text>
       </navigator>
-      <navigator url="./Feedback/index" hover-class="other-navigator-hover" class="flex-h">
+      <!-- <navigator url="./Feedback/index" hover-class="other-navigator-hover" class="flex-h">
         <view>
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodeicon2.png"></image>
         </view>
         <text class="flex-item">意见反馈</text>
         <text class="iconfont iconjiantouright"></text>
-      </navigator>
+      </navigator> -->
     </view>
 
     <!-- 授权头像获取弹窗 -->
@@ -62,19 +62,8 @@ export default {
     GetUserIcon
   },
   created () {
-    let _that = this
-    wx.login({
-      success (res) {
-        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
-          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
-            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
-          }
-          _that.Init()
-        })
-      }
+    this.$authed(() => {
+      this.Init()
     })
   },
   methods: {

src/store/index/index.js

@@ -79,6 +79,21 @@ export default {
     }
   },
   actions: {
+    GetNewsDetail (context, payload) { // 获取资讯详情
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetNewsDetail.url,
+          method: Api.GetNewsDetail.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetUserActivityList (context, payload) { // 获取我的活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({
@@ -241,8 +256,8 @@ export default {
     GetActivityList (context, payload) { // 获取活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({
-          url: Api.GetPhotoList.url,
-          method: Api.GetPhotoList.method,
+          url: Api.GetActivityList.url,
+          method: Api.GetActivityList.method,
           ...payload,
           success (res) {
             context.commit('UpdateActivityList', res.data.data.records)

src/util/Api/index.js

@@ -2,6 +2,10 @@
 const prefix = process.env.NODE_ENV === 'production' ? '' : ''
 
 const Api = {
+  GetNewsDetail: { // 获取资讯详情
+    method: 'get',
+    url: `${prefix}/news/:id`
+  },
   PostActivityJoin: { // 活动报名
     method: 'post',
     url: `${prefix}/activity/:id/enroll`
@@ -24,7 +28,7 @@ const Api = {
   },
   GetPhotoList: { // 获取照片墙列表
     method: 'get',
-    url: `${prefix}/activity`
+    url: `${prefix}/gallery`
   },
   GetActivityList: { // 获取活动列表
     method: 'get',