Merge branch 'uview2.0' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into uview2.0

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -104,7 +104,7 @@
 				</view>
 			</view>
 		</view>
-		<u-toast ref="uToast" />
+		<!-- <u-toast ref="uToast" /> -->
 	</view>
 </template>
 
@@ -209,9 +209,9 @@ export default {
           this.merchantMessage = res.data
           this.checkMonkey()
         }else{
-          this.$refs.uToast.show({
+          uni.showToast({
             title: res.message,
-            type: 'error',
+            icon: 'none'
           })
         }
       })
@@ -224,9 +224,9 @@ export default {
         if(res.code=='00'){
           this.option = res.data
         }else{
-          this.$refs.uToast.show({
+          uni.showToast({
             title: res.message,
-            type: 'error',
+            icon: 'none'
           })
         }
       })
@@ -244,9 +244,9 @@ export default {
 		    if(res.code=='00'){
 		      this.merchantList = res.data
 		    }else{
-		      this.$refs.uToast.show({
+		      uni.showToast({
 		        title: res.message,
-		        type: 'error',
+		        icon: 'none'
 		      })
 		    }
 		  })
@@ -283,9 +283,9 @@ export default {
           //隐藏加载框
           uni.hideLoading()
 		    }else{
-		      this.$refs.uToast.show({
+		      uni.showToast({
 		        title: res.message,
-		        type: 'error',
+		        icon: 'none'
 		      })
 		    }
 		  })
@@ -380,9 +380,9 @@ export default {
 					  this.originalPrices=0
           }
         }else{
-          this.$refs.uToast.show({
+          uni.showToast({
             title: res.message,
-            type: 'error',
+            icon: 'none'
           })
         }
       })
@@ -465,9 +465,9 @@ export default {
             url:'../../payment/orderPayment/orderPayment?orderId='+res.data.id+'&albumOrderdetail=1'
           })
         }else{
-          this.$refs.uToast.show({
-            title: res.message,
-            type: 'error',
+          uni.showToast({
+					  title: res.message,
+					  icon: 'none'
           })
         }
       })

pages/my/order/orderList/orderList.vue

@@ -159,7 +159,7 @@
 		<view class="product-goods" v-else>
 			<view class="order-No">暂无订单信息</view>
 		</view>
-		<u-toast ref="uToast" />
+		<!-- <u-toast ref="uToast" /> -->
 		<u-modal v-model="configShow" show-cancel-button="true" :content="configTitle" @confirm="operationEnter()" @cancel="operationClose()"></u-modal>
 	</view>
 </template>
@@ -479,16 +479,16 @@ export default {
     queryPhoneOrder(){//通过手机号查看订单
 			
       if(!(/^1[34578]\d{9}$/.test(this.touristPhone))){
-        this.$refs.uToast.show({
-          title: '请填写正确的手机号码',
-          type: 'error',
+        uni.showToast({
+				  title: '请填写正确的手机号码',
+				  icon: 'none'
         })
         return
       }
       if(this.touristName==''){
-        this.$refs.uToast.show({
-          title: '姓名不可为空',
-          type: 'error',
+        uni.showToast({
+				  title: '姓名不可为空',
+				  icon: 'none'
         })
         return
       }
@@ -508,9 +508,9 @@ export default {
           this.pageIndex = 1
           this.getData(1)
         }else{
-          this.$refs.uToast.show({
+          uni.showToast({
             title: res.message,
-            type: 'error',
+            icon: 'none'
           })
         }
 
@@ -600,9 +600,9 @@ export default {
               //隐藏加载框
               uni.hideLoading()
             }else{
-              this.$refs.uToast.show({
-                title: '暂无订单信息',
-                type: 'error',
+              uni.showToast({
+							  title: '暂无订单信息',
+							  icon: 'none'
               })
             }
           })
@@ -633,9 +633,9 @@ export default {
           .then((res)=>{
             var ret = res
             if(ret.code=='00'){
-              this.$refs.uToast.show({
-                title: '订单取消成功',
-                type: 'success',
+              uni.showToast({
+							  title: '订单取消成功',
+							  icon: 'none'
               })
               //this.$store.commit('showLoading')
               this.pageIndex = 1
@@ -646,9 +646,9 @@ export default {
               // this.getData(1)
               this.configShow = false
             }else{
-              this.$refs.uToast.show({
-                title: ret.message,
-                type: 'error',
+              uni.showToast({
+                title: res.message,
+                icon: 'none'
               })
             }
           })
@@ -660,9 +660,9 @@ export default {
           .then((res)=>{
             var ret = res
             if(ret.code=='00'){
-              this.$refs.uToast.show({
-                title: '订单删除成功',
-                type: 'success',
+              uni.showToast({
+							  title: '订单删除成功',
+							  icon: 'none'
               })
               //this.$store.commit('showLoading')
               this.pageIndex = 1
@@ -673,9 +673,9 @@ export default {
               // this.getData(1)
               this.configShow = false
             }else{
-              this.$refs.uToast.show({
-                title: ret.message,
-                type: 'error',
+              uni.showToast({
+                title: res.message,
+                icon: 'none'
               })
             }
           })