feats

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.131:8080"',
-    WSS_HOST: '"ws://192.168.0.131:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assemble.js

@@ -74,9 +74,8 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id
-      const recordId = this.$router.params.recordId || router.query.recordId
+      const id = this.$router.params.id
+      const recordId = this.$router.params.recordId
 
       this.setState({ id, recordId }, () => {
         this.loadDetail()
@@ -195,6 +194,8 @@ export default class Detail extends Component {
         this.updateLeftTime(res.taShareActivity.startTime, res.taShareActivity.endTime)
       }
 
+      Taro.setNavigationBarTitle({ title: res.taShareActivity.activityName })
+
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       // savePoint({
@@ -297,6 +298,12 @@ export default class Detail extends Component {
       }).catch(err => {
         console.log('err:', err)
         Taro.hideLoading()
+        
+        Taro.showToast({
+          title: '失败: ' + err.message,
+          icon: 'none'
+        })
+
         this.setState({ submitting: false })
       })
     })
@@ -420,15 +427,12 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
-                {
-                  groupState === GroupInProcess && actState != ActFinished &&
-                  (
-                    <View className="rest-time">
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
-                    </View>
-                  )
-                }
+                
+                <View className="rest-time">
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                </View>
+
               </View>
               <ScrollView
                 scrollY

src/pages/activity/detail/assistance.js

@@ -79,9 +79,8 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id
-      const initiateId = this.$router.params.initiateId || router.query.initiateId
+      const id = this.$router.params.id
+      const initiateId = this.$router.params.initiateId
 
       this.setState({ id, initiateId }, () => {
         this.loadDetail()
@@ -201,6 +200,8 @@ export default class Detail extends Component {
         this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
       }
 
+      Taro.setNavigationBarTitle({ title: res.helpActivity.title })
+
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       // savePoint({
@@ -303,6 +304,11 @@ export default class Detail extends Component {
       }).catch(err => {
         console.log('err:', err)
         Taro.hideLoading()
+        
+        Taro.showToast({
+          title: '失败: ' + err.message,
+          icon: 'none'
+        })
         this.setState({ submitting: false })
       })
     })
@@ -424,15 +430,12 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
-                {
-                  helpState === HelpInProcess && actState != ActFinished &&
-                  (
-                    <View className="rest-time">
-                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
-                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
-                    </View>
-                  )
-                }
+                
+                <View className="rest-time">
+                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                </View>
+
               </View>
               <ScrollView
                 scrollY

src/pages/activity/item/index.js

@@ -31,10 +31,10 @@ export default class Item extends Component {
             
           }
 
-          {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD hh:mm:ss')}`}</View> */}
+          {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD HH:mm:ss')}`}</View> */}
 
           <View className="left">
-            <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 hh:mm:ss')}`}</View>
+            <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
             <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
           </View>
         </View>

src/pages/person/profile/index.js

@@ -65,6 +65,9 @@ export default class Profile extends Component {
   }
 
   onChange(files) {
+    
+
+
     this.setState({
       files
     })