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

pages.json

@@ -142,7 +142,7 @@
             }
         },
         {
-            "path" : "pages/my/order/applyAfterSales/applyAfterSales",
+            "path" : "pages/my/order/afterSale/applyAfterSale/applyAfterSale",
             "style" : {
                 "navigationBarTitleText" : "售后",
                 "enablePullDownRefresh" : false
@@ -287,6 +287,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/my/travelNotes/myTravelogue/myTravelogue",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的行记",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/my/order/afterSale/afterSaleList/afterSaleList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "售后列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 		//分包加载配置，此配置为小程序的分包加载机制。
 		"subPackages": [

pages/my/center/center.vue

@@ -47,8 +47,8 @@
 				</view>
 			</view>
 			
-			<view class="middle2" @click="goOrderlist()">
-				<view class="middle2-top">
+			<view class="middle2">
+				<view class="middle2-top" @click="goOrderlist()">
 					<view>
 						我的订单
 					</view>
@@ -60,7 +60,7 @@
 				</view>
 				
 				<view class="middle2-bottom">
-					<view class="middle2-list">
+					<view class="middle2-list" @click="goOrderlist(0)">
 						<view>
 							<image src="@/static/img/my/center/pay.png"></image>
 						</view>
@@ -69,7 +69,7 @@
 						</view>
 					</view>
 					
-					<view class="middle2-list">
+					<view class="middle2-list" @click="goOrderlist(2)">
 						<view>
 							<image src="@/static/img/my/center/play.png"></image>
 						</view>
@@ -77,7 +77,7 @@
 							待使用
 						</view>
 					</view>
-					<view class="middle2-list">
+					<view class="middle2-list" @click="goOrderlist(3)">
 						<view>
 							<image src="@/static/img/my/center/evaluate.png"></image>
 						</view>
@@ -85,7 +85,7 @@
 							评价
 						</view>
 					</view>
-					<view class="middle2-list">
+					<view class="middle2-list" @click="goAfterSaleList()">
 						<view>
 							<image src="@/static/img/my/center/refund.png"></image>
 						</view>
@@ -150,7 +150,7 @@
 							行程单
 						</view>
 					</view>
-					<view class="middle3-list">
+					<view class="middle3-list" @click="goTravelNotes()">
 						<view>
 							<image src="@/static/img/my/center/mark.png"></image>
 						</view>
@@ -173,9 +173,9 @@ export default {
   },
   methods: {
     //---跳转到订单列表
-    goOrderlist(){
+    goOrderlist(orderStatus){
       uni.navigateTo({
-        url:'/pages/my/order/orderList/orderList'
+        url:'/pages/my/order/orderList/orderList?orderStatus='+orderStatus
       })
     },
     //---跳转购物车
@@ -220,6 +220,19 @@ export default {
 		    url:'/pages/my/travelList/travelList/travelList'
 		  })
     },
+    //---跳转我的行记
+    goTravelNotes(){
+		  uni.navigateTo({
+		    url:'/pages/my/travelNotes/myTravelogue/myTravelogue'
+		  })
+    },
+    //---跳转售后列表
+    goAfterSaleList(){
+		  uni.navigateTo({
+		    url:'/pages/my/order/afterSale/afterSaleList/afterSaleList'
+		  })
+    },
+		
   }
 }
 </script>

pages/my/order/afterSale/afterSaleList/afterSaleList.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出地址
+    }
+  },
+  onLoad(option) {
+    let companyId=this.$commonjs.getCompanyId(option)
+    let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+    let pdToken=uni.getStorageSync('token')||''
+    let pdCreateUserId=uni.getStorageSync('createUserId')||''
+    let pdUserId=uni.getStorageSync('userId')||''
+    let baseUrl='https://wx.pangdly.com/#/afterSalesList?companyId='
+    this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  },
+  methods: {
+			
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

pages/my/travelNotes/myTravelogue/myTravelogue.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出地址
+    }
+  },
+  onLoad(option) {
+    let companyId=this.$commonjs.getCompanyId(option)
+    let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+    let pdToken=uni.getStorageSync('token')||''
+    let pdCreateUserId=uni.getStorageSync('createUserId')||''
+    let pdUserId=uni.getStorageSync('userId')||''
+    let baseUrl='https://wx.pangdly.com/#/myCenter?companyId='
+    this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  },
+  methods: {
+			
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file