Merge branch 'feature_zmj'

demand/index/index.vue

@@ -56,12 +56,24 @@
 			</view>
 			<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
 		</view>
-		<view class="content-reject">
+		<view class="content-reject" v-if="subscript == 1">
 			<view class="">
 				<text></text>订单已驳回
 			</view>
 			<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
 		</view>
+		<view class="content-reject" v-if="subscript == 3 && subs== '1'" >
+			<view class="">
+				<text style="background:#2C66FF"></text>该订单已提交退款,等待商家致电……
+			</view>
+			<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
+		</view>
+		<view class="content-reject" v-if="subscript == 3 && subs== '2'">
+			<view class="">
+				<text></text>该订单已退款
+			</view>
+			<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
+		</view>
 	</view>
 	</view>
 </template>
@@ -73,10 +85,14 @@
 			return {
 				imgBgUrl: apiBaseConfig.imgBgUrl,
 				globalData: getApp().globalData,
-				scrollTopHeader: 0
+				scrollTopHeader: 0,
+				subscript:'0',
+				subs:'1'
 			};
 		},
-		onLoad() {
+		onLoad(option) {
+			this.subscript = option.subscript
+			this.subs = option.subs
 			this.timer = null;
 			this.innerAudioContext = uni.createInnerAudioContext();
 			// 监听音频进入可以播放状态的事件

pages.json

@@ -15,7 +15,10 @@
 		{
 			"path": "pages/demand/index",
 			"style": {
-				"navigationBarTitleText": "需求"
+				"navigationBarTitleText": "需求",
+				"mp-weixin": {
+					"navigationStyle": "custom"
+				}
 			}
 		},
 		{
@@ -82,13 +85,6 @@
 						"navigationStyle": "custom"
 					}
 				}
-			}, {
-				"path": "login/login",
-				"style": {
-					"navigationBarTitleText": "授权登录",
-					"enablePullDownRefresh": false
-				}
-
 			}]
 		},
 		{
@@ -120,7 +116,8 @@
 						"navigationBarTitleText": "支付成功",
 						"enablePullDownRefresh": false
 					}
-				}, {
+				},
+				{
 					"path": "updateForm/updateForm",
 					"style": {
 						"navigationBarTitleText": "订单修改",
@@ -132,13 +129,15 @@
 		},
 		{
 			"root": "order",
-			"pages": [{
-				"path": "detail/detail",
-				"style": {
-					"navigationBarTitleText": "动态",
-					"enablePullDownRefresh": false
+			"pages": [
+				{
+					"path": "detail/detail",
+					"style": {
+						"navigationBarTitleText": "动态",
+						"enablePullDownRefresh": false
+					}
 				}
-			}]
+			]
 		}
 	],
 	"globalStyle": {
@@ -152,4 +151,4 @@
 		"enablePullDownRefresh": false,
 		"onReachBottomDistance": 50
 	}
-}
+}

pages/demand/components/index.vue

@@ -3,9 +3,7 @@
 		<view class="content-matter" v-for="(v,index) in 20" @click="jump" :key="index">
 			<view class="content-matter-lampwick">
 				<view class="content-matter-lampwick-lampw">
-					<view class="">
-
-					</view>
+					<view class=""></view>
 					<view class="">灯泡灯芯坏了</view>
 				</view>
 				<view class="content-matter-lampwick-wick">
@@ -21,7 +19,7 @@
 					</view>
 					<!-- // 已发布 -->
 					<view class="buttoncolor" v-if="subscript == '0'">
-						<button class="buttoncl">修改</button>
+						<button class="buttoncl" @click.stop="modify">修改</button>
 						<button class="buttonclde" @click.stop="abolish(1)">取消订单</button>
 					</view>
 					<!-- // 已驳回 -->
@@ -49,8 +47,8 @@
 					<!-- // 已接单 -->
 					<view class="buttoncolor" v-if="subscript == '3'">
 						<button class="buttoncl" @click.stop="abolish(2)">退款</button>
-						<button class="buttonclde">详情</button>
-						<button class="buttonclde">已退款</button>
+						<button class="buttonclde" @click.stop="abolish(3)">详情</button>
+						<button class="buttonclde" @click.stop="abolish(4)">已退款</button>
 					</view>
 				</view>
 			</view>
@@ -88,7 +86,7 @@
 			// 跳转详情页
 			jump() {
 				this.$uniGo.navigateTo({
-					url: `/demand/index/index`
+					url: `/demand/index/index?subscript=${this.subscript}`
 				});
 			},
 			// 跳转支付界面
@@ -103,10 +101,18 @@
 					this.title = '确认取消订单吗'
 					this.titbut = '1'
 					this.show = true
-				} else {
+				} else if(val == 2){
 					this.title = '确认提交退款申请吗'
 					this.titbut = '2'
 					this.show = true
+				}else if(val == 3){
+					this.$uniGo.navigateTo({
+						url: `/demand/index/index?subscript=${this.subscript}&subs=${'1'}`
+					});
+				}else if(val == 4){
+					this.$uniGo.navigateTo({
+						url: `/demand/index/index?subscript=${this.subscript}&subs=${'2'}`
+					});
 				}
 			},
 			//重新发布按钮事件

pages/demand/index.vue

 <template>
 	<view class="content">
-		<view class="content-tabs">
+		<com-navbar :leftIcon="false" bgColor="#fff" title="需求" :titleStyle="{ color: '#000000', fontSize: '34rpx' }" />
+		<view ></view>
+		<view class="content-tabs" :style="{ top: `calc(${globalData.statusBarHeight}rpx + 122rpx)` }">
 			<view class="content-tabs-text" v-for="(v,index) in list" @click="jump(index)" :key="index">
 				<view class="" :style="subscript == index?'color: #000000;' : 'color: #444444;'">
 					{{v.name}}