wjx 2 vuotta sitten
vanhempi
commit
57224f3045
39 muutettua tiedostoa jossa 241 lisäystä ja 56 poistoa
  1. 6 2
      components/ad-custom-view/ad-custom-view.vue
  2. 54 10
      pages/extractBookCurr/extractBookCurr.vue
  3. 11 0
      pages/index/index.vue
  4. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ad-custom-view/ad-custom-view.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ad-view/ad-view.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/checkInRecord/checkInRecord.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/extractBookCurr/extractBookCurr.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/extractRecord/extractRecord.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-empty/u-empty.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map
  22. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  23. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  24. 8 8
      unpackage/dist/dev/mp-weixin/common/vendor.js
  25. 33 2
      unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.js
  26. 1 1
      unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.wxml
  27. 7 0
      unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.wxss
  28. 41 6
      unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.js
  29. 3 1
      unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.json
  30. 0 0
      unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.wxml
  31. 16 3
      unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.wxss
  32. 15 4
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  33. 5 4
      unpackage/dist/dev/mp-weixin/project.config.json
  34. 5 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js
  35. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxml
  36. 7 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxss
  37. 10 8
      utils/ad_config.js
  38. 2 2
      utils/request.js
  39. 14 2
      uview-ui/components/u-popup/u-popup.vue

+ 6 - 2
components/ad-custom-view/ad-custom-view.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="{display: isShow ? 'block' : 'none'}">
+	<view :style="{display: isShow ? 'block' : 'none'}" class="ad-view">
 		<ad-custom :unit-id="unitId" :ad-intervals="adIntervals" @error="onerror" @load="onload"></ad-custom>
 	</view>
 </template>
@@ -36,5 +36,9 @@
 </script>
 
 <style>
-
+	.ad-view {
+		overflow: hidden;
+		border-radius: 20rpx;
+		margin-top: 40rpx;
+	}
 </style>

+ 54 - 10
pages/extractBookCurr/extractBookCurr.vue

@@ -26,10 +26,14 @@
 			</view>
 			
 		</view>
+		
+		<view style="margin: 20rpx 20rpx 20rpx" v-if="adConfig.videoPatch">
+			<ad-custom-view :unitId="adConfig.videoPatch" adIntervals="200"></ad-custom-view>
+		</view>
 	
 		<!-- 规则弹窗 -->
 		<u-popup v-model="ruleShow" mode="center" :closeable="true" border-radius="18" close-icon-color="#FFF" @close="ruleShow=false" custom-style="{backgroundColor: #DC8182}">
-			<view class="popupCenter">
+			<view class="popupCenter" slot="content">
 				<view class="popupTitle">提取书币规则</view>
 				<view class="bottom">
 					<view>
@@ -55,20 +59,33 @@
 					</view>
 				</view>
 			</view>
+			<view class="footer" slot="footer">
+				<view class="ad">
+					<ad-view :unitId="adConfig.bannerAd" adIntervals="200" v-if="adConfig.bannerAd"></ad-view>
+				</view>
+			</view>
 		</u-popup>
 		
 		<!-- 次数用完弹窗 -->
 		<u-popup v-model="countShow" mode="center" :closeable="true" border-radius="18" close-icon-color="#000" @close="countShow=false">
-			<view class="popupCount">
+			<view class="popupCount" slot="content">
 				<image src="../../static/noCountGold.png" mode="heightFix"></image>
 				<text class="title">今日次数已用完,明日再来~</text>
 				<text class="subTitle">提醒:每日只能提取一次</text>
 				<button type="default" class="bt" @click="countShow=false">我知道了</button>
 			</view>
+			<view class="footer" slot="footer">
+				<view class="ad">
+					<ad-view :unitId="adConfig.bannerAd" adIntervals="200" v-if="adConfig.bannerAd"></ad-view>
+				</view>
+			</view>
 		</u-popup>
 		
 		<!-- 提取成功弹窗 -->
 		<view class="popup" v-if="succShow">
+			<view class="ad">
+				<ad-view :unitId="adConfig.bannerAd" adIntervals="200" v-if="adConfig.bannerAd"></ad-view>
+			</view>
 			<view class="popupContent">
 				<view class="content">
 					<image src="../../static/popupBack.png"></image>
@@ -90,15 +107,26 @@
  ***/
 <script>
 	import { config, getBalance, getQuotaList, setCoinRemove } from '@/api/api.js'
+	import { videoPatch, bannerAd } from '@/utils/ad_config.js'
+	import adView from '@/components/ad-view/ad-view.vue'
+	import adCustomView from '@/components/ad-custom-view/ad-custom-view.vue'
 	export default {
+		components: {
+			adView,
+			adCustomView
+		},
 		data() {
 			return {
+				adConfig: {
+					videoPatch,
+					bannerAd
+				},
 				ruleShow: false,  // 规则弹窗控制
 				countShow: false, // 次数用完弹窗
 				succShow: false,  // 提取成功弹窗
 				bookCurrList: [],// 数据列表
 				bookCurrId: undefined, // 选择充值项
-				bookCurrNum: undefined, // 选择的书币数量
+				bookCurrNum: 0, // 选择的书币数量
 				balance: 0,  // 余额
 				mpData: {}
 			}
@@ -117,6 +145,9 @@
 		},
 		methods: {
 			goBack() {
+				// let pages = getCurrentPages();
+				// let prevPage = pages[pages.length - 2]; //上一个页面
+				// prevPage.$vm.getBookCurr();//重点$vm
 				uni.navigateBack();
 			},
 			selectHandle(item) {
@@ -149,16 +180,14 @@
 				setCoinRemove({...this.mpData, appId: config.appid, bookCoinId: this.bookCurrId}).then(res => {
 					switch(res.data) {
 						case 0:
-							// uni.showToast({
-							// 	title: '提取成功'
-							// })
 							this.succShow = true
 							this.getData()
 							break;
 						case 1:
 							uni.showToast({
 								title: '提取失败, 请在公众号发送任意消息预约, 再来提取',
-								icon: 'error'
+								duration: 4000,
+								icon: 'none'
 							})
 							break;
 						case 2:
@@ -353,19 +382,21 @@
 		position: fixed;
 		width: 100%;
 		height: 100vh;
-		background: rgba(0, 0, 0, 0.6);
+		background: rgba(0, 0, 0, 0.8);
 		top: 0;
 		left: 0;
 		right: 0;
 		bottom: 0;
+		z-index: 999999;
 		.popupContent {
 			width: 632rpx;
 			
 			position: absolute;
-			top: 50%;
+			top: 55%;
 			left: 50%;
 			transform: translate(-50%, -50%);
 			text-align: center;
+			z-index: 99999;
 			&>.content {
 				position: relative;
 				&>image {
@@ -429,8 +460,21 @@
 			&>.close {
 				width: 54rpx;
 				height: 54rpx;
-				margin-top: 76rpx;
+				margin-top: 56rpx;
 			}
 		}
+	
+		.ad {
+			position: absolute;
+			top: 50rpx;
+			width: 750rpx;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+		}
+	}
+	
+	.footer {
+		padding: 0 30rpx 28rpx;
+		box-sizing: border-box;
 	}
 </style>

+ 11 - 0
pages/index/index.vue

@@ -307,6 +307,17 @@
 		onUnload() {
 			uni.hideLoading()
 			timer && clearInterval(timer)
+			lqTimer && clearInterval(lqTimer)
+			adTimer && clearTimeout(adTimer)
+			powerOnTimer && clearInterval(powerOnTimer)
+			this.interstitialAd.destroy()
+		},
+		onHide() {
+			console.log('页面隐藏')
+			timer && clearInterval(timer)
+			lqTimer && clearTimeout(lqTimer)
+			adTimer && clearTimeout(adTimer)
+			powerOnTimer && clearInterval(powerOnTimer)
 		},
 		onShareAppMessage() {},
 		filters: {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ad-custom-view/ad-custom-view.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ad-view/ad-view.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/checkInRecord/checkInRecord.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/extractBookCurr/extractBookCurr.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/extractRecord/extractRecord.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-empty/u-empty.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -13,5 +13,6 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,7 +105,7 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"uni_modules/almost-lottery/components/almost-lottery/almost-lottery":1,"components/ad-view/ad-view":1,"uview-ui/components/u-notice-bar/u-notice-bar":1,"uview-ui/components/u-navbar/u-navbar":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-empty/u-empty":1,"uview-ui/components/u-column-notice/u-column-notice":1,"uview-ui/components/u-row-notice/u-row-notice":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-mask/u-mask":1};
+/******/ 		var cssChunks = {"uni_modules/almost-lottery/components/almost-lottery/almost-lottery":1,"components/ad-custom-view/ad-custom-view":1,"components/ad-view/ad-view":1,"uview-ui/components/u-notice-bar/u-notice-bar":1,"uview-ui/components/u-navbar/u-navbar":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-empty/u-empty":1,"uview-ui/components/u-column-notice/u-column-notice":1,"uview-ui/components/u-row-notice/u-row-notice":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-mask/u-mask":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {

+ 8 - 8
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -11327,8 +11327,8 @@ function _setCoinRemove() {_setCoinRemove = _asyncToGenerator( /*#__PURE__*/_reg
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.request = request;var apiUrl = 'https://test.api.zanxiangnet.com/miniapp';
-// let apiUrl = 'https://api.zanxiangnet.com/miniapp'
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.request = request; // let apiUrl = 'https://test.api.zanxiangnet.com/miniapp'
+var apiUrl = 'https://api.zanxiangnet.com/miniapp';
 
 
 var isopen = false; // 控制loading
@@ -11718,12 +11718,12 @@ var base64ToPath = function base64ToPath(base64) {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.videoAd = exports.singleLatticeAd = exports.insertScreenAd = exports.urgeVideoAd = exports.bannerAd = void 0;var bannerAd = ''; // banner 广告
-exports.bannerAd = bannerAd;var urgeVideoAd = ''; // 激励视频广告
-exports.urgeVideoAd = urgeVideoAd;var insertScreenAd = ''; // 插屏广告
-exports.insertScreenAd = insertScreenAd;var singleLatticeAd = ''; // 单格子广告
-exports.singleLatticeAd = singleLatticeAd;var videoAd = ''; // 领取记录视频广告
-exports.videoAd = videoAd;
+Object.defineProperty(exports, "__esModule", { value: true });exports.videoPatch = exports.videoAd = exports.singleLatticeAd = exports.insertScreenAd = exports.urgeVideoAd = exports.bannerAd = void 0;var bannerAd = 'adunit-8a29806490307cca'; // banner 广告
+exports.bannerAd = bannerAd;var urgeVideoAd = 'adunit-78d6fdf55117f04e'; // 激励视频广告
+exports.urgeVideoAd = urgeVideoAd;var insertScreenAd = 'adunit-24fc47b121f3d2a7'; // 插屏广告
+exports.insertScreenAd = insertScreenAd;var singleLatticeAd = 'adunit-9f53f09552ebfc06'; // 单格子广告
+exports.singleLatticeAd = singleLatticeAd;var videoAd = 'adunit-d0109bc73a5a7870'; // 领取记录视频广告
+exports.videoAd = videoAd;var videoPatch = 'adunit-85e7970f2b2d980f';exports.videoPatch = videoPatch;
 
 /***/ }),
 /* 51 */,

+ 33 - 2
unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.js

@@ -12,16 +12,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ad_custom_view_vue_vue_type_template_id_1f88c338___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ad-custom-view.vue?vue&type=template&id=1f88c338& */ 106);
 /* harmony import */ var _ad_custom_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ad-custom-view.vue?vue&type=script&lang=js& */ 108);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _ad_custom_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _ad_custom_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
+/* harmony import */ var _ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ad-custom-view.vue?vue&type=style&index=0&lang=css& */ 174);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 11);
 
 var renderjs
 
 
 
 
+
 /* normalize component */
 
-var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
   _ad_custom_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _ad_custom_view_vue_vue_type_template_id_1f88c338___WEBPACK_IMPORTED_MODULE_0__["render"],
   _ad_custom_view_vue_vue_type_template_id_1f88c338___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -146,6 +148,35 @@ var _default =
       this.isShow = false;
     } } };exports.default = _default;
 
+/***/ }),
+
+/***/ 174:
+/*!*****************************************************************************************************************************************************!*\
+  !*** C:/Users/77876/Documents/HBuilderProjects/qc-luckyDraw-yanguang/components/ad-custom-view/ad-custom-view.vue?vue&type=style&index=0&lang=css& ***!
+  \*****************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./ad-custom-view.vue?vue&type=style&index=0&lang=css& */ 175);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_D_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_D_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_ad_custom_view_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 175:
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/77876/Documents/HBuilderProjects/qc-luckyDraw-yanguang/components/ad-custom-view/ad-custom-view.vue?vue&type=style&index=0&lang=css& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+    if(false) { var cssReload; }
+  
+
 /***/ })
 
 }]);

+ 1 - 1
unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.wxml

@@ -1 +1 @@
-<view style="{{'display:'+(isShow?'block':'none')+';'}}"><ad-custom vue-id="1738af22-1" unit-id="{{unitId}}" ad-intervals="{{adIntervals}}" data-event-opts="{{[['^error',[['onerror']]],['^load',[['onload']]]]}}" bind:error="__e" bind:load="__e" bind:__l="__l"></ad-custom></view>
+<view class="ad-view" style="{{'display:'+(isShow?'block':'none')+';'}}"><ad-custom vue-id="1738af22-1" unit-id="{{unitId}}" ad-intervals="{{adIntervals}}" data-event-opts="{{[['^error',[['onerror']]],['^load',[['onload']]]]}}" bind:error="__e" bind:load="__e" bind:__l="__l"></ad-custom></view>

+ 7 - 0
unpackage/dist/dev/mp-weixin/components/ad-custom-view/ad-custom-view.wxss

@@ -0,0 +1,7 @@
+
+.ad-view {
+	overflow: hidden;
+	border-radius: 20rpx;
+	margin-top: 40rpx;
+}
+

+ 41 - 6
unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.js

@@ -98,8 +98,14 @@ try {
     uNavbar: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-navbar/u-navbar */ "uview-ui/components/u-navbar/u-navbar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 110))
     },
+    adCustomView: function() {
+      return __webpack_require__.e(/*! import() | components/ad-custom-view/ad-custom-view */ "components/ad-custom-view/ad-custom-view").then(__webpack_require__.bind(null, /*! @/components/ad-custom-view/ad-custom-view.vue */ 105))
+    },
     uPopup: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 117))
+    },
+    adView: function() {
+      return __webpack_require__.e(/*! import() | components/ad-view/ad-view */ "components/ad-view/ad-view").then(__webpack_require__.bind(null, /*! @/components/ad-view/ad-view.vue */ 98))
     }
   }
 } catch (e) {
@@ -272,16 +278,44 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _api = __webpack_require__(/*! @/api/api.js */ 47);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var _default =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _api = __webpack_require__(/*! @/api/api.js */ 47);
+var _ad_config = __webpack_require__(/*! @/utils/ad_config.js */ 50);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var adView = function adView() {__webpack_require__.e(/*! require.ensure | components/ad-view/ad-view */ "components/ad-view/ad-view").then((function () {return resolve(__webpack_require__(/*! @/components/ad-view/ad-view.vue */ 98));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var adCustomView = function adCustomView() {__webpack_require__.e(/*! require.ensure | components/ad-custom-view/ad-custom-view */ "components/ad-custom-view/ad-custom-view").then((function () {return resolve(__webpack_require__(/*! @/components/ad-custom-view/ad-custom-view.vue */ 105));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
 {
+  components: {
+    adView: adView,
+    adCustomView: adCustomView },
+
   data: function data() {
     return {
+      adConfig: {
+        videoPatch: _ad_config.videoPatch,
+        bannerAd: _ad_config.bannerAd },
+
       ruleShow: false, // 规则弹窗控制
       countShow: false, // 次数用完弹窗
       succShow: false, // 提取成功弹窗
       bookCurrList: [], // 数据列表
       bookCurrId: undefined, // 选择充值项
-      bookCurrNum: undefined, // 选择的书币数量
+      bookCurrNum: 0, // 选择的书币数量
       balance: 0, // 余额
       mpData: {} };
 
@@ -300,6 +334,9 @@ var _api = __webpack_require__(/*! @/api/api.js */ 47);function ownKeys(object,
   },
   methods: {
     goBack: function goBack() {
+      // let pages = getCurrentPages();
+      // let prevPage = pages[pages.length - 2]; //上一个页面
+      // prevPage.$vm.getBookCurr();//重点$vm
       uni.navigateBack();
     },
     selectHandle: function selectHandle(item) {
@@ -332,16 +369,14 @@ var _api = __webpack_require__(/*! @/api/api.js */ 47);function ownKeys(object,
       (0, _api.setCoinRemove)(_objectSpread(_objectSpread({}, this.mpData), {}, { appId: _api.config.appid, bookCoinId: this.bookCurrId })).then(function (res) {
         switch (res.data) {
           case 0:
-            // uni.showToast({
-            // 	title: '提取成功'
-            // })
             _this3.succShow = true;
             _this3.getData();
             break;
           case 1:
             uni.showToast({
               title: '提取失败, 请在公众号发送任意消息预约, 再来提取',
-              icon: 'error' });
+              duration: 4000,
+              icon: 'none' });
 
             break;
           case 2:

+ 3 - 1
unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.json

@@ -4,6 +4,8 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
-    "u-popup": "/uview-ui/components/u-popup/u-popup"
+    "ad-custom-view": "/components/ad-custom-view/ad-custom-view",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "ad-view": "/components/ad-view/ad-view"
   }
 }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.wxml


+ 16 - 3
unpackage/dist/dev/mp-weixin/pages/extractBookCurr/extractBookCurr.wxss

@@ -179,20 +179,22 @@ page {
   position: fixed;
   width: 100%;
   height: 100vh;
-  background: rgba(0, 0, 0, 0.6);
+  background: rgba(0, 0, 0, 0.8);
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
+  z-index: 999999;
 }
 .popup .popupContent {
   width: 632rpx;
   position: absolute;
-  top: 50%;
+  top: 55%;
   left: 50%;
   -webkit-transform: translate(-50%, -50%);
           transform: translate(-50%, -50%);
   text-align: center;
+  z-index: 99999;
 }
 .popup .popupContent > .content {
   position: relative;
@@ -253,6 +255,17 @@ page {
 .popup .popupContent > .close {
   width: 54rpx;
   height: 54rpx;
-  margin-top: 76rpx;
+  margin-top: 56rpx;
+}
+.popup .ad {
+  position: absolute;
+  top: 50rpx;
+  width: 750rpx;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.footer {
+  padding: 0 30rpx 28rpx;
+  box-sizing: border-box;
 }
 

+ 15 - 4
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -608,7 +608,7 @@ var timer = null,powerOnTimer = null,adTimer = null,lqTimer = null;var AlmostLot
       // 本地
       weightTotal: 0, // 权重数组
       weightArr: [], balanceCount: 0 };}, computed: { isApple: function isApple() {return uni.getSystemInfoSync().platform === 'ios';} }, onLoad: function onLoad(options) {var _this = this; // 请求奖品数据
-    this.mpData = options;this.getData();this.animation = uni.createAnimation({ timingFunction: 'ease' });(0, _api.getVersion)({ appId: _api.config.appid }).then(function (res) {_this.remoteVersion = res.data;});}, onUnload: function onUnload() {uni.hideLoading();timer && clearInterval(timer);}, onShareAppMessage: function onShareAppMessage() {}, filters: { getTimerFilter: function getTimerFilter(value) {// 获取年月日时分秒
+    this.mpData = options;this.getData();this.animation = uni.createAnimation({ timingFunction: 'ease' });(0, _api.getVersion)({ appId: _api.config.appid }).then(function (res) {_this.remoteVersion = res.data;});}, onUnload: function onUnload() {uni.hideLoading();timer && clearInterval(timer);lqTimer && clearInterval(lqTimer);adTimer && clearTimeout(adTimer);powerOnTimer && clearInterval(powerOnTimer);this.interstitialAd.destroy();}, onHide: function onHide() {console.log('页面隐藏');timer && clearInterval(timer);lqTimer && clearTimeout(lqTimer);adTimer && clearTimeout(adTimer);powerOnTimer && clearInterval(powerOnTimer);}, onShareAppMessage: function onShareAppMessage() {}, filters: { getTimerFilter: function getTimerFilter(value) {// 获取年月日时分秒
       if (!value) return "";var timestamp = Date.parse(new Date(value));var date = new Date(timestamp);var Y = date.getFullYear();var M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();var H = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();var S = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();return "".concat(Y, "-").concat(M, "-").concat(D, " ").concat(H, ":").concat(minute, ":").concat(S);} }, onPullDownRefresh: function onPullDownRefresh() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:_context.next = 2;return _this2.handleInitCanvas();case 2:_context.next = 4;return _this2.getList();case 4:uni.stopPullDownRefresh();case 5:case "end":return _context.stop();}}}, _callee);}))();}, onReady: function onReady() {if (_ad_config.urgeVideoAd) {this.createInterstitialAd();this.powerOnShowAd();}}, watch: { // 监听获奖序号的变动
     popupShow: function popupShow(newVal, oldVal) {this.openAniBt(newVal);}, popupVIPShow: function popupVIPShow(newVal) {this.openAniBt(newVal);}, popup12Show: function popup12Show(newVal) {this.openAniBt(newVal);}, popupGoldShow: function popupGoldShow(newVal) {this.openAniBt(newVal);} }, methods: { // 获取金币余额
     getBookCurr: function getBookCurr() {var _this3 = this;(0, _api.getBalance)({ appId: _api.config.appid, mpAppId: this.mpData.mpAppId, mpOpenId: this.mpData.mpOpenId }).then(function (res) {_this3.balanceCount = res.data || 0;});}, powerOnShowAd: function powerOnShowAd() {var _this4 = this; // 开机25秒调取弹窗广告 以后没5分钟调取
@@ -628,9 +628,20 @@ var timer = null,powerOnTimer = null,adTimer = null,lqTimer = null;var AlmostLot
           if (_this5.videoType === 1) {// 看视频翻倍领取
             _this5.receiveGold(true);} else if (_this5.videoType === 2) {// 看视频抽奖
             if (!_this5.mpName) {// 首次没有重公众号进入
-              _this5.localGetPrizeIndex();return;}_this5.remoteGetPrizeIndex();}} else {// 播放中途退出
-          _this5.prizeing = false;_this5.freeNum++;}});}, // 抽完奖显示插屏广告
-    showCpAd: function showCpAd() {var _this6 = this;lqTimer && clearTimeout(lqTimer);setTimeout(function () {_this6.showInterstitialAd();
+              _this5.localGetPrizeIndex();return;}_this5.remoteGetPrizeIndex();
+          }
+        } else {
+          // 播放中途退出
+          _this5.prizeing = false;
+          _this5.freeNum++;
+        }
+      });
+    },
+    // 抽完奖显示插屏广告
+    showCpAd: function showCpAd() {var _this6 = this;
+      lqTimer && clearTimeout(lqTimer);
+      setTimeout(function () {
+        _this6.showInterstitialAd();
       }, 10000);
     },
     // 显示插屏广告广告

+ 5 - 4
unpackage/dist/dev/mp-weixin/project.config.json

@@ -22,9 +22,9 @@
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
+    "useMultiFrameRuntime": false,
+    "useApiHook": false,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -36,13 +36,14 @@
     "packNpmRelationList": [],
     "minifyWXSS": true,
     "disableUseStrict": false,
+    "minifyWXML": true,
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
     "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wx4e8c3f946c06c519",
+  "appid": "wxe1b04d1d8f6df382",
   "projectname": "qc-luckyDraw-yanguang",
   "condition": {
     "search": {

+ 5 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js

@@ -210,6 +210,11 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
+//
+//
+//
+//
+//
 
 /**
  * popup 弹窗

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxml


+ 7 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxss

@@ -121,4 +121,11 @@
   right: 30rpx;
   bottom: 30rpx;
 }
+.u-footer.data-v-17becaea {
+  position: fixed;
+  width: 750rpx;
+  bottom: 10rpx;
+  display: flex;
+  justify-content: center;
+}
 

+ 10 - 8
utils/ad_config.js

@@ -1,12 +1,14 @@
-let bannerAd = '' // banner 广告
-let urgeVideoAd = ''	 // 激励视频广告
-let insertScreenAd = '' // 插屏广告
-let singleLatticeAd = '' // 单格子广告
-let videoAd = '' // 领取记录视频广告
+let bannerAd = 'adunit-8a29806490307cca' // banner 广告
+let urgeVideoAd = 'adunit-78d6fdf55117f04e'	 // 激励视频广告
+let insertScreenAd = 'adunit-24fc47b121f3d2a7' // 插屏广告
+let singleLatticeAd = 'adunit-9f53f09552ebfc06' // 单格子广告
+let videoAd = 'adunit-d0109bc73a5a7870' // 领取记录视频广告
+let videoPatch = 'adunit-85e7970f2b2d980f'
 export {
-	bannerAd,   
+	bannerAd,
 	urgeVideoAd,
-	insertScreenAd,  
+	insertScreenAd,
 	singleLatticeAd,
-	videoAd
+	videoAd,
+	videoPatch
 }

+ 2 - 2
utils/request.js

@@ -1,5 +1,5 @@
-let apiUrl = 'https://test.api.zanxiangnet.com/miniapp'
-// let apiUrl = 'https://api.zanxiangnet.com/miniapp'
+// let apiUrl = 'https://test.api.zanxiangnet.com/miniapp'
+let apiUrl = 'https://api.zanxiangnet.com/miniapp'
 
 
 let isopen = false  // 控制loading

+ 14 - 2
uview-ui/components/u-popup/u-popup.vue

@@ -27,12 +27,17 @@
 					:size="closeIconSize"
 				></u-icon>
 				<scroll-view class="u-drawer__scroll-view" scroll-y="true">
-					<slot />
+					<slot name="content"/>
 				</scroll-view>
 			</view>
 			<scroll-view class="u-drawer__scroll-view" scroll-y="true" v-else>
-				<slot />
+				<slot name="content"/>
 			</scroll-view>
+			
+			<view class="u-footer">
+				<slot name="footer"/>
+			</view>
+			
 			<view @tap="close" class="u-close" :class="['u-close--' + closeIconPos]">
 				<u-icon
 					v-if="mode != 'center' && closeable"
@@ -453,4 +458,11 @@ export default {
 	right: 30rpx;
 	bottom: 30rpx;
 }
+.u-footer {
+	position: fixed;
+	width: 750rpx;
+	bottom: 10rpx;
+	display: flex;
+	justify-content: center;
+}
 </style>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä