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() {