Merge branch 'ios' of https://e.coding.net/g-cphe0354/duanju/video_app into wwzios

me/mFYpdwbMdk/imagsconment.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="gyqSxFeTGt">
-		<image class="img CBKwkqgyqg" src="./asz.JPG" mode="widthFix"></image>
 		<image class="img QxmTgyqLtb" src="./IMG_6962.jpg" mode="widthFix"></image>
 		<image class="img QxmTgyqLtb" src="./IMG_6963.jpg" mode="widthFix"></image>
 		<image class="img QxmTgyqLtb" src="./IMG_6964.jpg" mode="widthFix"></image>

me/yaoqing/ymf-yaoqing-home.vue

@@ -350,7 +350,7 @@
 			},
 			ymfsharurl() {
 				let that = this;
-				uni.ymfshowModal({
+				uni.showModal({
 					title: '链接推广',
 					content: this.tuiguang + this.erweima,
 					showCancel: true,
@@ -720,7 +720,7 @@
 									}
 								});
 							} else {
-								uni.ymfshowModal({
+								uni.showModal({
 									title: '提示',
 									content: '请先在设置页面打开“保存相册”使用权限',
 									confirmText: '去设置',

me/yaoqing/ymg-yaoqing-tixian.vue

@@ -256,12 +256,12 @@ export default {
     //钱包明细
     ymfgoqianbao() {
       uni.navigateTo({
-        url: '/me/yaoqing/tixianList?moneyType=1&viewType=2'
+        url: '/me/yaoqing/redPack-mingxi?moneyType=1&viewType=2'
       });
     },
     ymfgoaliZhiFuBao() {
       uni.navigateTo({
-        url: '/me/yaoqing/zhifubao-tixain-tixain'
+        url: '/me/yaoqing/zhifubao-tixain'
       });
     },
     ymfgetMoney() {

pages.json

@@ -212,6 +212,17 @@
 				// #endif
 			}
 
+		},{
+			"path": "pages/yodwbsHlmJ/aaacasadwqvb",
+			"style": {
+				"navigationBarTitleText": "追剧as",
+				"enablePullDownRefresh": false
+					// #ifdef H5
+					,
+				"navigationStyle": "custom"
+				// #endif
+			}
+
 		}, {
 			"path": "pages/video/video",
 			"style": {
@@ -272,6 +283,13 @@
 				"navigationBarTitleText": "开屏广告",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/BdwbOqUuVz/imagsconment",
+			"style": {
+				"navigationBarTitleText": "图片s",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"subPackages": [{

pages/BdwbOqUuVz/imagsconment.vue

@@ -1,11 +1,9 @@
 <template>
 	<view class="gyqSxFeTGt">
-		<image class="img CBKwkqgyqg" src="./asz.JPG" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6808.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6808.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6810.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6811.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6812.jpg" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6808.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6810.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6811.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6812.JPG" mode="widthFix"></image>
 	</view>
 </template>
 

pages/me/index.vue

@@ -147,7 +147,7 @@
 						</view>
 					</view> -->
 					<view v-if="isShowMoneyPay" class="tool-box-content-item flex align-center justify-center flex-wrap"
-						@click="goNav('/me/ymf-yaoqing-home')">
+						@click="goNav('/me/yaoqing/ymf-yaoqing-home')">
 						<view class="tool-box-content-item-img">
 							<image src="../../static/images/me/vfx.png" mode=""></image>
 						</view>

pages/task/index.vue

@@ -50,7 +50,7 @@
 		<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
 
 			<view class="cell flex justify-between" v-for="(item,index) in list" :key="index" 
-				v-if="(item.buttonUrl=='/me/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/ymf-yaoqing-home'"
+				v-if="(item.buttonUrl=='/me/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'"
 				>
 				<view class="cell_left flex">
 					<view class="cell_title flex">

pages/yodwbsHlmJ/aaacasadwqvb.vue

@@ -1,14 +1,10 @@
 <template>
 	<view class="gyqSxFeTGt">
-		<image class="img CBKwkqgyqg" src="./asz.JPG" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6982.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6983.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6984.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6985.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6986.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6986.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6986.jpg" mode="widthFix"></image>
-		<image class="img QxmTgyqLtb" src="./IMG_6986.jpg" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6983.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6984.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6811.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6985.JPG" mode="widthFix"></image>
+		<image class="img QxmTgyqLtb" src="/static/dwbimgs/IMG_6986.JPG" mode="widthFix"></image>
 	</view>
 </template>