Merge branch 'hotfix/join0402' into master

src/components/orderCard.vue

@@ -34,7 +34,7 @@
                   @click.stop="cancelSignUp"
                   v-if="!isExpire()">取消报名</button>
           <button class="submit-btn u-font-24 u-m-l-24"
-                  @click.stop="submitResult">提交结果</button>
+                  @click.stop="submitResult">提交订单</button>
         </view>
       </block>
       <block v-if="value.join_status * 1 === 4">

src/pages.json

@@ -127,7 +127,7 @@
         {
           "path": "submitOutcome",
           "style": {
-            "navigationBarTitleText": "提交结果"
+            "navigationBarTitleText": "提交订单"
           }
         },
         {

src/pagesSub/activity/activityDetail.vue

@@ -481,6 +481,7 @@ export default {
         if (type === 1) {
           this.isDialog = true
           this.dlgTitle = '报名成功'
+          this.getDetailData()
           // uni.navigateTo({
           //   url: `/pagesSub/activity/signUpOutcome?endTime=${this.detail.end_time}&platType=${this.detail.plat_type}`
           // })
@@ -540,7 +541,7 @@ export default {
         }
       })
     },
-    // 提交结果
+    // 提交订单
     toSubmiteOrder () {
       if (!this.$store.state.userInfo.alipay_account) {
         uni.navigateTo({

src/pagesSub/other/noviceStrategy.vue

@@ -34,7 +34,7 @@
       <view class="item">
         <view class="line-40  bold">3.提交活动资料，并提交审核</view>
         <view class="u-m-t-8 u-new-color line-34">用户根据活动要求提交相应资料，等待审核。</view>
-        <view class="desc line-34">具体提交资料方法：完成下单后，在活动详情页内，点击下方“提交结果”按钮，并按照要求填写对应凭证，提交审核。</view>
+        <view class="desc line-34">具体提交资料方法：完成下单后，在活动详情页内，点击下方“提交订单”按钮，并按照要求填写对应凭证，提交审核。</view>
       </view>
       <view class="item">
         <view class="line-40  bold">4.获取返利</view>