Merge branch 'main' of http://git.mokasz.com/maomao/mini_read_space_front

# Conflicts:
#	pages/video/video.js

api/api.js

@@ -106,7 +106,7 @@ export const getBrowsingHistory = () => {
 
 // 获取短剧列表
 export function getVideoList(params = {}) {
-    const {page = 1, size = 10, tag_id = 2245, filter_id = "", next_id = ""} = params;
+    const {page = 1, size = 10, tag_id = 2245, filter_id = "", next_id = "",gh_id = ""} = params;
 
     const requestData = {
         tag_id: tag_id,
@@ -114,7 +114,7 @@ export function getVideoList(params = {}) {
         next_id: next_id,
         count: size,
         uuid: getApp().globalData.uuid, // 固定值，实际应用中可能需要动态生成
-        gh_id: "gh_4e55f615d5dc" // 固定值
+        gh_id: gh_id // 固定值
     };
 
     return postWithCommonParams("https://applet.xiaoduer.cn/cashvideoapi/cashvideo/getvideolist", requestData)

components/charge-dialog/charge-dialog.js

@@ -85,7 +85,7 @@ Component({
             unlockChapter(params).then(res => {
               console.log(res)
               novelManager.paymentCompleted()
-              console.log('章节解锁成功')
+              console.log('章节解锁成功',this.properties.chapterIndex)
             })
             this.videoAd.offClose()
           } else {

config/config.js

@@ -4,24 +4,25 @@ const appInfoObj = {
         ghid: 'gh_4e55f615d5dc',
         appName: '试读空间',
         ads: {
-          insertAdId: 'adunit-37ee342a8fc046b7',
-          rewardAdId: 'adunit-7df7b95b78f624f8',
-          bookmarkAdId: 'adunit-343af082b8c8ea18'
-      },
+            insertAdId: 'adunit-37ee342a8fc046b7',
+            rewardAdId: 'adunit-7df7b95b78f624f8',
+            bookmarkAdId: 'adunit-343af082b8c8ea18',
+            templateAdId: 'adunit-80f6ec7a264f968b'
+        },
     },
-  };
-  
-  // @config 确定使用的小程序appid
-  const appid = 'wxa7a33088566e1292';
-  export const apple = {
+};
+
+// @config 确定使用的小程序appid
+const appid = 'wxa7a33088566e1292';
+export const apple = {
     ...appInfoObj[appid],
     appKey: '8ZCND8Zkjs6JEPpzTUJd2sOg1',
-  };
-  
-  // 线上域名信息
-  export const https = {
+};
+
+// 线上域名信息
+export const https = {
     dev_apiHttps: 'https://hyperion-novel-qa-app.mokamrp.com',
     test_apiHttps: 'https://hyperion-novel-qa-app.mokamrp.com',
     apiHttps: 'https://hyperion-novel-qa-app.mokamrp.com'
-  };
+};
   

pages/video/video.wxml

@@ -69,9 +69,9 @@
           </view>
         </view>
          <!-- 卡片原生广告 -->
-         <view wx:if="{{hasLoadAdConfig && itm.adType === 'templateAd' }}" class="ad-custom-card-1">
-            <ad-custom unit-id="{{ads.template_card_ads}}" data-field="templateError" data-name="首页页-卡片原生"
-              data-adId="{{ads.template_card_ads}}" capture-bind:tap="appletsAdClick" bindload="appletsAdLoad"
+         <view wx:if="{{itm.adType === 'templateAd' }}" class="ad-custom-card-1">
+            <ad-custom unit-id="adunit-80f6ec7a264f968b" data-field="templateError" data-name="首页页-卡片原生"
+              data-adId="adunit-80f6ec7a264f968b" capture-bind:tap="appletsAdClick" bindload="appletsAdLoad"
               binderror="appletsAdError"></ad-custom>
           </view>
       </block>