Skip to content

X
xinrenli-app
Commit 23c2406e by honghong
Options

Merge branch 'feature_zmj'

parents 51184dcc 5b12b8e7
Showing with 51 additions and 28 deletions
demand/index/index.vue
...@@ -56,12 +56,24 @@ ...@@ -56,12 +56,24 @@
</view> </view>
<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea> <u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
</view> </view>
<view class="content-reject"> <view class="content-reject" v-if="subscript == 1">
<view class=""> <view class="">
<text></text>订单已驳回 <text></text>订单已驳回
</view> </view>
<u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea> <u--textarea v-model="value1" placeholder="请输入内容" disabled></u--textarea>
</view> </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>
</view> </view>
</template> </template>
...@@ -73,10 +85,14 @@ ...@@ -73,10 +85,14 @@
return { return {
imgBgUrl: apiBaseConfig.imgBgUrl, imgBgUrl: apiBaseConfig.imgBgUrl,
globalData: getApp().globalData, 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.timer = null;
this.innerAudioContext = uni.createInnerAudioContext(); this.innerAudioContext = uni.createInnerAudioContext();
// 监听音频进入可以播放状态的事件 // 监听音频进入可以播放状态的事件
......
pages.json
...@@ -15,7 +15,10 @@ ...@@ -15,7 +15,10 @@
{ {
"path": "pages/demand/index", "path": "pages/demand/index",
"style": { "style": {
"navigationBarTitleText": "需求" "navigationBarTitleText": "需求",
"mp-weixin": {
"navigationStyle": "custom"
}
} }
}, },
{ {
...@@ -82,13 +85,6 @@ ...@@ -82,13 +85,6 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }
}, {
"path": "login/login",
"style": {
"navigationBarTitleText": "授权登录",
"enablePullDownRefresh": false
}
}] }]
}, },
{ {
...@@ -120,7 +116,8 @@ ...@@ -120,7 +116,8 @@
"navigationBarTitleText": "支付成功", "navigationBarTitleText": "支付成功",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { },
{
"path": "updateForm/updateForm", "path": "updateForm/updateForm",
"style": { "style": {
"navigationBarTitleText": "订单修改", "navigationBarTitleText": "订单修改",
...@@ -132,13 +129,15 @@ ...@@ -132,13 +129,15 @@
}, },
{ {
"root": "order", "root": "order",
"pages": [{ "pages": [
"path": "detail/detail", {
"style": { "path": "detail/detail",
"navigationBarTitleText": "动态", "style": {
"enablePullDownRefresh": false "navigationBarTitleText": "动态",
"enablePullDownRefresh": false
}
} }
}] ]
} }
], ],
"globalStyle": { "globalStyle": {
...@@ -152,4 +151,4 @@ ...@@ -152,4 +151,4 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"onReachBottomDistance": 50 "onReachBottomDistance": 50
} }
} }
pages/demand/components/index.vue
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
<view class="content-matter" v-for="(v,index) in 20" @click="jump" :key="index"> <view class="content-matter" v-for="(v,index) in 20" @click="jump" :key="index">
<view class="content-matter-lampwick"> <view class="content-matter-lampwick">
<view class="content-matter-lampwick-lampw"> <view class="content-matter-lampwick-lampw">
<view class=""> <view class=""></view>
</view>
<view class="">灯泡灯芯坏了</view> <view class="">灯泡灯芯坏了</view>
</view> </view>
<view class="content-matter-lampwick-wick"> <view class="content-matter-lampwick-wick">
...@@ -21,7 +19,7 @@ ...@@ -21,7 +19,7 @@
</view> </view>
<!-- // 已发布 --> <!-- // 已发布 -->
<view class="buttoncolor" v-if="subscript == '0'"> <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> <button class="buttonclde" @click.stop="abolish(1)">取消订单</button>
</view> </view>
<!-- // 已驳回 --> <!-- // 已驳回 -->
...@@ -49,8 +47,8 @@ ...@@ -49,8 +47,8 @@
<!-- // 已接单 --> <!-- // 已接单 -->
<view class="buttoncolor" v-if="subscript == '3'"> <view class="buttoncolor" v-if="subscript == '3'">
<button class="buttoncl" @click.stop="abolish(2)">退款</button> <button class="buttoncl" @click.stop="abolish(2)">退款</button>
<button class="buttonclde">详情</button> <button class="buttonclde" @click.stop="abolish(3)">详情</button>
<button class="buttonclde">已退款</button> <button class="buttonclde" @click.stop="abolish(4)">已退款</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -88,7 +86,7 @@ ...@@ -88,7 +86,7 @@
// 跳转详情页 // 跳转详情页
jump() { jump() {
this.$uniGo.navigateTo({ this.$uniGo.navigateTo({
url: `/demand/index/index` url: `/demand/index/index?subscript=${this.subscript}`
}); });
}, },
// 跳转支付界面 // 跳转支付界面
...@@ -103,10 +101,18 @@ ...@@ -103,10 +101,18 @@
this.title = '确认取消订单吗' this.title = '确认取消订单吗'
this.titbut = '1' this.titbut = '1'
this.show = true this.show = true
} else { } else if(val == 2){
this.title = '确认提交退款申请吗' this.title = '确认提交退款申请吗'
this.titbut = '2' this.titbut = '2'
this.show = true 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> <template>
<view class="content"> <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="content-tabs-text" v-for="(v,index) in list" @click="jump(index)" :key="index">
<view class="" :style="subscript == index?'color: #000000;' : 'color: #444444;'"> <view class="" :style="subscript == index?'color: #000000;' : 'color: #444444;'">
{{v.name}} {{v.name}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment