10.5 o k

activityPages/activityDetail/jurisdiction/components.vue

@@ -8,9 +8,7 @@
           <text style="margin-bottom: 30rpx"> 您可申请开通试用 </text>
         </view>
         <view class="tip" v-else>{{ jurisdictionList.PopupMsg }}</view>
-        <view class="btn-cont" v-if="jurisdictionList.Type !== '专项调研'" @click="applyAuth">
-          {{ urisdictionList.IsResearch && jurisdictionList.HasPermission === 3 ? "提交申请" : "立即申请" }}
-        </view>
+        <view class="btn-cont" v-if="jurisdictionList.Type !== '专项调研'" @click="applyAuth"> 立即申请 </view>
       </block>
       <view class="tip" v-if="jurisdictionList.HasPermission === 2">
         <view v-if="jurisdictionList.IsResearch" class="research-noauth">
@@ -30,7 +28,9 @@
           </block>
         </block>
       </view>
-      <view v-if="jurisdictionList.HasPermission === 2 && jurisdictionList.Type !== '专项调研'" class="btn-cont" @click="sellerApplyAuth"> 立即申请 </view>
+      <view v-if="jurisdictionList.HasPermission === 2 && jurisdictionList.Type !== '专项调研'" class="btn-cont" @click="sellerApplyAuth">
+        {{ jurisdictionList.IsResearch ? "提交申请" : "立即申请" }}
+      </view>
       <view class="btn-cont back-btn" @click="backIndex"> 返回</view>
       <view style="margin-top: 100rpx" v-if="jurisdictionList.IsResearch">
         <view class="research-btn" @click="goRouterResearch('介绍')">

components/modalDialog.vue

@@ -17,36 +17,54 @@
       </view>
     </u-modal>
     <!-- 修改手机号 -->
+    <block v-if="jurisdictionList.IsResearch">
+      <u-modal
+        v-model="showhasPermission"
+        :content-style="{ fontSize: '32rpx' }"
+        @confirm="showhasPermissionBtn"
+        :show-cancel-button="true"
+        confirm-text="提交申请"
+        @cancel="showhasPermissionCancel"
+        :show-title="false"
+        :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+        :confirm-style="{ fontWeight: '700' }"
+      >
+        <view class="slot-content" v-if="jurisdictionList.IsResearch">
+          <rich-text :nodes="jurisdictionList.PopupMsg"></rich-text>
+        </view>
+      </u-modal>
+    </block>
+    <block v-else>
+      <!-- 拨打电话 -->
+      <u-modal
+        v-model="showhasPermission"
+        :content-style="{ fontSize: '32rpx' }"
+        @confirm="showhasPermissionBtn"
+        :show-cancel-button="true"
+        confirm-text="提交申请"
+        @cancel="showhasPermissionCancel"
+        :show-title="false"
+        :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+        :confirm-style="{ fontWeight: '700' }"
+      >
+        <view class="slot-content">
+          <!-- 2 - 活动视频  3 - 产业视频 -->
+          <block v-if="jurisdictionList.isAudioVideo == 2 || jurisdictionList.isAudioVideo == 3">
+            <text>您暂无权限查看此视频</text>
+            <text>若想查看可以联系对口销售</text>
+          </block>
+          <block v-else>
+            <text>您暂无权限参加此活动</text>
+            <text>若想参加可以联系对口销售</text>
+          </block>
 
-    <!-- 拨打电话 -->
-    <u-modal
-      v-model="showhasPermission"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="showhasPermissionBtn"
-      :show-cancel-button="true"
-      confirm-text="提交申请"
-      @cancel="showhasPermissionCancel"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <!-- 2 - 活动视频  3 - 产业视频 -->
-        <block v-if="jurisdictionList.isAudioVideo == 2 || jurisdictionList.isAudioVideo == 3">
-          <text>您暂无权限查看此视频</text>
-          <text>若想查看可以联系对口销售</text>
-        </block>
-        <block v-else>
-          <text>您暂无权限参加此活动</text>
-          <text>若想参加可以联系对口销售</text>
-        </block>
-
-        <view
-          >{{ jurisdictionList.SellerName }} : <text @click="mobileDial" class="seller-mobile"> {{ jurisdictionList.SellerMobile }}</text></view
-        >
-        <text>申请开通对应的试用权限</text>
-      </view>
-    </u-modal>
+          <view
+            >{{ jurisdictionList.SellerName }} : <text @click="mobileDial" class="seller-mobile"> {{ jurisdictionList.SellerMobile }}</text></view
+          >
+          <text>申请开通对应的试用权限</text>
+        </view>
+      </u-modal>
+    </block>
   </view>
 </template>