Merge branch 'v_req_11.2' into uat

src/pages/CampusFundingGuardian/CampusFundingGuardian.vue

@@ -54,29 +54,70 @@
           <view class="warn"></view>
           <view>您尚未开通垫资守护，本次限免垫资已用完~</view>
         </view> -->
-		<view class="tip normal">
+        <view class="tip normal">
           <view class="safe"></view>
           <view>垫资守护服务，限时免费体验中~</view>
         </view>
       </view>
     </view>
     <view class="img"></view>
-    <view class="open">
+    <view class="open" v-if="CompusComsumeData.sch_open_cons_membership">
       <view class="finger"></view>
     </view>
   </view>
 </template>
 
 <script>
+var gHost = "https://" + window.location.host;
+if (window.location.protocol != "https:") {
+  gHost = "https://uat-pay.xiaopay.net";
+}
 export default {
   data() {
     return {
       faceType: "",
       fromPage: "",
+      sessionId: "",
+      CompusComsumeData: {}
     };
   },
-  onLoad: function (options) {},
+  onLoad: function (options) {
+    this.sessionId = options.sessionId || "";
+  },
   onShow() {},
+  methods: {
+    // 小程序游戏统计接口
+    async GetCompusComsumeData() {
+      $.ajax({
+        url:
+          gHost +
+          "/wechat/svweapp/GetCompusComsumeData?sessionid=" +
+          this.sessionId,
+        type: "post",
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        data: {
+          feeType: 3,
+        },
+        success: function (res) {
+          if (res.code == 10000) {
+            console.log(res);
+            this.CompusComsumeData = res.results
+            return;
+          }
+          uni.showToast({
+            icon: "none",
+            mask: true,
+            title: res.message,
+          });
+          return;
+        },
+        error: function (error) {
+          reject(error);
+        },
+      });
+    },
+  },
 };
 </script>
 
@@ -250,7 +291,7 @@ export default {
           background-size: cover;
         }
         .safe {
-		  align-self: center;
+          align-self: center;
           width: 33rpx;
           height: 33rpx;
           margin-right: 4rpx;
@@ -263,7 +304,7 @@ export default {
       .normal {
         background: rgba(254, 221, 160, 0.5);
         border-radius: 24rpx;
-		color: #935100;
+        color: #935100;
       }
     }
   }

src/pages/gameOrder/gameOrder.vue

@@ -104,6 +104,13 @@ export default {
           description: "奇思妙想的拼图世界",
           appId: "wxb5612f7e17786c46",
         },
+        {
+          icon: this.$ImgUrl + "gameOrder/game13.png",
+          name: "酷鼠宝快跑",
+          score: "跑酷消除",
+          description: "一款轻松快乐的消除游戏。快些挖洞，帮助鼠宝逃离大蛇的追击吧!",
+          appId: "wxad3052c2d2a34787",
+        },
       ],
       params: {
         sessionid: "",