wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wangmingchuan:12c429415d681ded1d34c256ba3794173978a7d8
Branches Tags
wangmingchuan:dev
wangmingchuan:h5
wangmingchuan:main
wangmingchuan:master
wangmingchuan:pifa
wangmingchuan:version/0412
..
compare: wangmingchuan:369978ee66e94f9979ed0d4217003ee858eec44e
Branches Tags
wangmingchuan:dev
wangmingchuan:h5
wangmingchuan:main
wangmingchuan:master
wangmingchuan:pifa
wangmingchuan:version/0412

No commits in common. '12c429415d681ded1d34c256ba3794173978a7d8' and '369978ee66e94f9979ed0d4217003ee858eec44e' have entirely different histories.
12c429415d ... 369978ee66

6 changed files with 221 additions and 280 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 7
      api/help.js
  2. 27
      api/invoice.js
  3. 187
      pages/invoice/editset.vue
  4. 64
      pages/invoice/indexset.vue
  5. 128
      pages/news1/feedback.vue
  6. 62
      pages/news1/text.vue

7
api/help.js
Unescape View File

@ -8,12 +8,9 @@ const api = {
joinStore: 'store/joinStore', joinStore: 'store/joinStore',
getStoreType: 'store/getStoreType', getStoreType: 'store/getStoreType',
storeSet:'store/editStore', storeSet:'store/editStore',
storeInfo:'store/getStoreInfo', storeInfo:'store/getStoreInfo'
getAgreement: 'user/getAgreement',
}
export const getAgreement = (data) => {
return request.get(api.getAgreement,data)
} }
// 帮助中心列表 // 帮助中心列表
export const list = (param) => { export const list = (param) => {
return request.get(api.list, param) return request.get(api.list, param)

27
api/invoice.js
Unescape View File

@ -9,7 +9,7 @@ const api = {
invoicingDel: 'user/invoicingDel', invoicingDel: 'user/invoicingDel',
invoicingDetail: 'user/invoicingDetail', invoicingDetail: 'user/invoicingDetail',
invoicingAdd: 'user/invoicingAdd', invoicingAdd: 'user/invoicingAdd',
invoicingEdit: 'user/invoicingEdit' invoicingEdit: 'user/invoicingEdit',
} }
export const invoicingEdit = (orderGoodsId, data) => { export const invoicingEdit = (orderGoodsId, data) => {
@ -24,17 +24,28 @@ export const invoicingAdd = (orderGoodsId, data) => {
form: data form: data
}) })
} }
export const addInvoicing = (data) => { export const addInvoicing = (orderGoodsId, data) => {
return request.post(api.addInvoicing,data) return request.post(api.addInvoicing, {
orderGoodsId,
form: data
})
} }
export const myInvoicing = (orderGoodsId, data) => { export const myInvoicing = (orderGoodsId, data) => {
return request.get(api.myInvoicing,data) return request.get(api.myInvoicing, {
orderGoodsId,
form: data
})
} }
export const editInvoicing = (data) => { export const editInvoicing = (orderGoodsId, data) => {
return request.post(api.editInvoicing,data) return request.post(api.editInvoicing, {
form: data
})
} }
export const invoicingLog = (data) => { export const invoicingLog = (orderGoodsId, data) => {
return request.get(api.invoicingLog,data) return request.get(api.invoicingLog, {
orderGoodsId,
form: data
})
} }
export function invoicingDel(param, option) { export function invoicingDel(param, option) {
return request.get(api.invoicingDel, param, option) return request.get(api.invoicingDel, param, option)

187
pages/invoice/editset.vue
Unescape View File

@ -13,8 +13,7 @@
<view class="l">发票类型：</view> <view class="l">发票类型：</view>
<view class="r"> <view class="r">
<picker :value="index" :range="array" @change="bindPickerChange"> <picker :value="index" :range="array" @change="bindPickerChange">
<view class="lx" style="color: #888;" v-if="index == null">请选择发票类型</view> <view class="lx">{{ index == -1 ? '请选择' : array[index] }}</view>
<view class="lx" v-else>{{ array[index] }}</view>
</picker> </picker>
</view> </view>
</view> </view>
@ -25,10 +24,17 @@
<view class="li" :class="tabIndex == 2 ? 'li-on' : ''" @click="tabItem(2)">单位</view> <view class="li" :class="tabIndex == 2 ? 'li-on' : ''" @click="tabItem(2)">单位</view>
</view> </view>
</view> </view>
<view class="item"> <view class="item" v-if="tabIndex != 2">
<view class="l">发票抬头：</view> <view class="l">发票抬头：</view>
<view class="r"> <view class="r">
<input type="text" v-model="obj.header" :placeholder="tabIndex == 2 ? '请输入单位名称' : '请输入个人姓名'" /> <input type="text" v-model="obj.header" placeholder="请输入个人姓名" />
</view>
</view>
<view class="item" v-if="tabIndex == 2">
<view class="l">发票抬头：</view>
<view class="r">
<input type="text" v-model="array1[index1]" placeholder="请输入单位名称" />
<!-- <view class="tt" @click="bindPickerChange1" style="color: rgb(58, 134, 255)">更改抬头</view> -->
</view> </view>
</view> </view>
<view class="item" v-if="tabIndex == 2"> <view class="item" v-if="tabIndex == 2">
@ -71,7 +77,7 @@
</view> </view>
</view> </view>
<view class="invoice-btn"> <view class="invoice-btn">
<view class="invoice-fd" @click="onSubmit()"> <view class="invoice-fd" @click="toDetail()">
提交 提交
</view> </view>
</view> </view>
@ -86,66 +92,51 @@ import * as InvoiceApi from '@/api/invoice'
export default { export default {
data() { data() {
return { return {
id: '',
content: "确认您的发票信息无误后再提交", content: "确认您的发票信息无误后再提交",
show: true, show: true,
toggleIndex: true, toggleIndex: true,
index: null, index: -1,
array: ['普通增值税发票'], array: ['普通增值税发票'],
tabIndex: null, index1: -1,
array1: [],
tabIndex: 2,
sourcePage: 0, sourcePage: 0,
orderDetail: '', orderDetail: '',
orderId: '', orderId: '',
obj: { obj: {
header: '', header: '',
gongsi: '',
duty_no: '', duty_no: '',
bank_name: '', bank_name: '',
bank_no: '', bank_no: '',
address: '', address: '',
phone: '', phone: '',
type: 1, type: '',
source: '' source: 2
} }
}; };
}, },
onLoad(op) { onLoad(op) {
if (op.detailObj && op.detailObj != 'null') { let app = this;
let end = JSON.parse(op.detailObj) app.orderId = op.orderId
this.index = 0 app.sourcePage = op.source == 1 ? op.source : 0
if (end.source == 1) { if (op.source == 0) {
this.tabIndex = 1 app.orderDetail = op.order ? JSON.parse(op.order) : '';
} else { }
this.tabIndex = 2 if (op.source == 2 || op.source == 1) {
} let detail = op.detail ? JSON.parse(op.detail) : '';
this.obj = end app.index = detail.type == 1 ? 0 : 1;
app.tabIndex = detail.source
app.obj = detail
} }
// let app = this;
// app.orderId = op.orderId
// app.sourcePage = op.source == 1 ? op.source : 0
// if (op.source == 0) {
// app.orderDetail = op.order ? JSON.parse(op.order) : '';
// }
// if (op.source == 2 || op.source == 1) {
// let detail = op.detail ? JSON.parse(op.detail) : '';
// app.index = detail.type == 1 ? 0 : 1;
// app.tabIndex = detail.source
// app.obj = detail
// }
}, },
methods: { methods: {
//添加发票 // 获取当前订单信息
onSubmit() { toDetail(canReset = false) {
if (this.obj.id) {
this.editeInvoice()
} else {
this.addInvoice()
}
},
async addInvoice(canReset = false) {
const app = this const app = this
if (app.index == null || !app.obj.source) { if (app.index == -1) {
uni.showToast({ uni.showToast({
title: '请选择发票类型', title: '请选择发票类型',
icon: 'none', icon: 'none',
@ -163,67 +154,70 @@ export default {
} }
if (app.tabIndex == 2 && !app.obj.duty_no) { if (app.tabIndex == 2 && !app.obj.duty_no) {
uni.showToast({ uni.showToast({
title: '请输入纳税人识别号', title: '请输入抬头',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
return return
} }
let { app.isLoading = true;
status, if (app.tabIndex == 1) {
data app.obj.gongsi = '';
} = await InvoiceApi.addInvoicing(app.obj); app.obj.duty_no = '';
if (status == 200) { app.obj.bank_name = '';
uni.showToast({ app.obj.bank_no = '';
title: '新增成功！', app.obj.address = '';
icon: 'none', app.obj.phone = '';
duration: 2000
})
app.index = null
app.tabIndex =null
app.obj = app.$options.data().obj
} }
}, app.obj.type = app.index == 0 ? 1 : 2;
async editeInvoice() { app.obj.source = app.tabIndex;
const app = this let url = ''
if (app.index == null || !app.obj.source) { if (app.sourcePage == 0) { //开票addInvoicing editInvoicing invoicingAdd
uni.showToast({ url = InvoiceApi.invoicingAdd(app.orderId, app.obj)
title: '请选择发票类型',
icon: 'none',
duration: 2000
})
return
} }
if (!app.obj.header) { if (app.sourcePage == 1) { //我的开票使用某一个开票
uni.showToast({ app.obj.invoice_id = app.obj.id; //选择
title: '请输入抬头', url = InvoiceApi.invoicingAdd(app.orderId, app.obj)
icon: 'none',
duration: 2000
})
return
} }
if (app.tabIndex == 2 && !app.obj.duty_no) { if (app.sourcePage == 2) { //申请记录 修改抬头
uni.showToast({ url = InvoiceApi.invoicingEdit(app.orderId, app.obj)
title: '请输入抬头',
icon: 'none',
duration: 2000
})
return
} }
let { if (app.sourcePage == 3) { //新增发票抬头
status, url = InvoiceApi.addInvoicing(app.orderId, app.obj)
data }
} = await InvoiceApi.editInvoicing(app.obj); if (app.sourcePage == 4) { //我的发票记录过来编辑
if (status == 200) { url = InvoiceApi.editInvoicing(app.orderId, app.obj)
uni.showToast({
title: '编辑成功！',
icon: 'none',
duration: 2000
})
app.index = null
app.tabIndex =null
app.obj = app.$options.data().obj
} }
debugger
url.then(result => {
if (result.status == 200) {
uni.showToast({
title: result.message,
icon: 'none',
duration: 2000
})
if (result.data.list.length.length > 0) {
uni.navigateTo({
url: "/pages/invoice/detail?id=" + result.data.list[0].id
})
} else {
uni.showToast({
title: '请求成功无返回详情',
icon: 'none',
duration: 2000
})
}
} else {
uni.showToast({
title: result.message,
icon: 'none',
duration: 2000
})
}
})
// 相应全局事件订阅: 刷新上级页面数据
canReset && uni.$emit('syncRefresh', true, true)
}, },
// 复制指定内容 // 复制指定内容
@ -244,10 +238,10 @@ export default {
onClose() { }, onClose() { },
tabItem(i) { tabItem(i) {
this.tabIndex = i; this.tabIndex = i;
this.obj.source = i
}, },
toggleItem(i) { toggleItem(i) {
this.toggleIndex = !this.toggleIndex; this.toggleIndex = !this.toggleIndex;
this.pamres.invoiceUnit = this.toggleIndex
}, },
bindPickerChange(e) { bindPickerChange(e) {
this.index = e.detail.value; this.index = e.detail.value;
@ -262,7 +256,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.invoice-btn { .invoice-btn{
width: 100%; width: 100%;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -271,14 +265,11 @@ export default {
z-index: 8; z-index: 8;
background: #F5F5F5; background: #F5F5F5;
} }
.invoice-company{
.invoice-company {
margin-bottom: 170rpx; margin-bottom: 170rpx;
} }
.invoice { .invoice {
padding-bottom: 1rpx; padding-bottom: 1rpx;
&-goods { &-goods {
padding: 0 20rpx 0 40rpx; padding: 0 20rpx 0 40rpx;
overflow: hidden; overflow: hidden;

64
pages/invoice/indexset.vue
Unescape View File

@ -15,12 +15,12 @@
<view class="bill-record" v-else> <view class="bill-record" v-else>
<view class="bill-item" v-for="(item, index) in recordList" :key="index"> <view class="bill-item" v-for="(item, index) in recordList" :key="index">
<view class="bill-item-left"> <view class="bill-item-left">
<view class="commpany-name">{{item.header}}</view> <view class="commpany-name">飞科网络科技有限公司</view>
<view class="bill-price"> <view class="bill-price">
<text>¥</text>{{item.price}} <text>¥</text>150
</view> </view>
</view> </view>
<text class="bill-time">{{item.created_at}}</text> <text class="bill-time">2023-12-31</text>
</view> </view>
</view> </view>
@ -28,18 +28,18 @@
<!-- 发票抬头 --> <!-- 发票抬头 -->
<view v-if="tabIndex == 1"> <view v-if="tabIndex == 1">
<view class="invoice-header"> <view class="invoice-header">
<view class="bill-header-item" @click="onAddInvoice(item)" v-for="(item, index) in recordHeaderList" :key="index"> <view class="bill-header-item" @click="onAddInvoice" v-for="(item, index) in recordList" :key="index">
<view class="bill-header-left"> <view class="bill-header-left">
<view class="header-type"> 普通增值税发票-{{item.source == 1?'个人':'单位'}}</view> <view class="header-type">普通发票抬头-个人</view>
<view class="bill-header"> <view class="bill-header">
{{item.header}} 王大幅
</view> </view>
</view> </view>
<u-icon name="edit-pen" size="30" color="#838383"></u-icon> <u-icon name="edit-pen" size="30" color="#838383"></u-icon>
</view> </view>
</view> </view>
<view class="invoice-btn-box"> <view class="invoice-btn-box">
<view class="invoice-btn" @click="onAddInvoice(null)"> <view class="invoice-btn" @click="onAddInvoice">
<text>+</text>添加发票抬头 <text>+</text>添加发票抬头
</view> </view>
</view> </view>
@ -47,7 +47,6 @@
</view> </view>
</template> </template>
<script> <script>
@ -57,55 +56,24 @@ export default {
data() { data() {
return { return {
tabIndex: 0, tabIndex: 0,
recordList: [], invoicList: [],
recordHeaderList:[] recordList: [1, 2]
}; };
}, },
onLoad() { onLoad() {
this.getRecordList()
}, },
methods: { methods: {
onTabClick(index) { onTabClick(index) {
this.tabIndex = index this.tabIndex = index
if(index == 1){
this.recordHeaderList = []
this.getHeaderList()
}else{
this.recordList = []
this.getRecordList()
}
},
//发票记录
async getRecordList() {
uni.showLoading({
title: "加载中"
})
let {
status,
data
} = await InvoiceApi.invoicingLog({});
if (status == 200) {
uni.hideLoading();
this.recordList = data.list
}
}, },
//发票抬头 onEdit(item) {
async getHeaderList() { uni.navigateTo({
uni.showLoading({ url: "/pages/invoice/editset?detail=" + JSON.stringify(item) + '&source=' + 4
title: "加载中"
}) })
let {
status,
data
} = await InvoiceApi.myInvoicing({});
if (status == 200) {
uni.hideLoading();
this.recordHeaderList = data.list
}
}, },
onAddInvoice(item) { onAddInvoice() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/invoice/editset?detailObj=" + JSON.stringify(item) url: "/pages/invoice/editset?source=" + 3
}) })
}, },
} }
@ -141,12 +109,12 @@ export default {
.invoice-header { .invoice-header {
background: #fff; background: #fff;
padding-bottom: 164rpx;
.bill-header-item { .bill-header-item {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-end;
padding: 54rpx 46rpx 64rpx 64rpx; padding: 54rpx 46rpx 120rpx 64rpx;
} }
.header-type { .header-type {

128
pages/news1/feedback.vue
Unescape View File

@ -22,7 +22,7 @@
<u-form-item label="反馈类型" label-width="170"> <u-form-item label="反馈类型" label-width="170">
<u-radio-group v-model="form.type"> <u-radio-group v-model="form.type">
<u-radio active-color="#FF4434" v-for="(item, index) in checkboxList1" :key="index" <u-radio active-color="#FF4434" v-for="(item, index) in checkboxList1" :key="index"
:name="item.val"> :name="item.name">
{{ item.name }} {{ item.name }}
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
@ -31,7 +31,7 @@
<u-form-item label="反馈类型" label-width="170"> <u-form-item label="反馈类型" label-width="170">
<u-radio-group v-model="form.shop"> <u-radio-group v-model="form.shop">
<u-radio active-color="#FF4434" v-for="(item, index) in checkboxList2" :key="index" <u-radio active-color="#FF4434" v-for="(item, index) in checkboxList2" :key="index"
:name="item.val"> :name="item.name">
{{ item.name }} {{ item.name }}
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
@ -45,16 +45,15 @@
<u-form-item label="投诉内容" required label-width="150" label-position="top"> <u-form-item label="投诉内容" required label-width="150" label-position="top">
<u-input v-model="form.comment" class="textarea" placeholder="请填写投诉内容" type="textarea" /> <u-input v-model="form.comment" class="textarea" placeholder="请填写投诉内容" type="textarea" />
</u-form-item> </u-form-item>
<u-upload :action="action" :header="header" :fileList="finishImageList" :previewFullImage="true" <u-upload :fileList="finishImageList" :previewFullImage="true" @afterRead="afterRead" :maxCount="8"
@afterRead="afterRead" :maxCount="8" upload-text="上传照片" @delete="deletePic" name="1" width="180" height="180" upload-text="上传照片" @delete="deletePic" name="1" multiple></u-upload>
multiple></u-upload>
</view> </view>
<view class="section1Item" style="margin-top:20rpx;"> <view class="section1Item" style="margin-top:20rpx;">
<u-form-item label="您的称呼" label-width="170"> <u-form-item label="您的称呼" label-width="170">
<u-input placeholder="请输入您的称呼" v-model="form.user_name" /> <u-input placeholder="请输入您的称呼" v-model="form.name" />
</u-form-item> </u-form-item>
<u-form-item label="手机号码" label-width="170"> <u-form-item label="手机号码" label-width="170">
<u-input placeholder="请输入手机号" v-model="form.mobile" /> <u-input placeholder="请输入手机号" v-model="form.phone" />
</u-form-item> </u-form-item>
</view> </view>
</u-form> </u-form>
@ -63,26 +62,19 @@
<view class="introText">1.工作人员将于1小时内与您联系解决您的问题(工作时间为周一至周日09:00~21:30)</view> <view class="introText">1.工作人员将于1小时内与您联系解决您的问题(工作时间为周一至周日09:00~21:30)</view>
<view class="introText">2.有效投诉奖励：最高奖励200元现金/代金券</view> <view class="introText">2.有效投诉奖励：最高奖励200元现金/代金券</view>
</view> </view>
<view class="submitBtn-box"> <view class="submitBtn" @click="submit">
<view class="submitBtn" @click="submit"> 提交
提交
</view>
</view> </view>
</view> </view>
<view class="section2" v-if="OrderType == 1 && feedBackList.length > 0"> <view class="section2" v-if="OrderType == 1 && feedBackList.length > 0">
<view class="feedShow" v-for="(item, index) in feedBackList" :key="index"> <view class="feedShow" v-for="(item, index) in feedBackList" :key="index">
<view class="feedbackItem"> <view class="feedbackItem">
<view class="feedbackContent"> <view class="feedbackContent">
<view class="fbTitle"> <view class="fbTitle">
<view class="fbFlag" v-if="item.type == 1"> <view class="fbFlag">
<text>投诉</text> <text v-if="item.type == 1">投诉</text>
</view> <text v-if="item.type == 2">建议</text>
<view class="fbFlag fbFlag2" v-if="item.type == 2"> <text v-if="item.type == 3">表扬</text>
<text>建议</text>
</view>
<view class="fbFlag fbFlag3" v-if="item.type == 3">
<text>表扬</text>
</view> </view>
<view class="fbTitleText"> <view class="fbTitleText">
{{ item.shop_name }} {{ item.shop_name }}
@ -94,14 +86,16 @@
</view> </view>
<u-read-more showHeight="160" textIndent="0" fontSize="26rpx" color="#9E9E9E" :toggle="true" <u-read-more showHeight="160" textIndent="0" fontSize="26rpx" color="#9E9E9E" :toggle="true"
close-text="展开"> close-text="展开">
<rich-text :nodes="item.content"></rich-text> <rich-text v-if="index != 0" :nodes="item.content"></rich-text>
<rich-text v-else
nodes="投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容投诉内容"></rich-text>
</u-read-more> </u-read-more>
<view class="timefb"> <view class="timefb">
{{ item.created_at }} {{ item.created_at }}
</view> </view>
</view> </view>
<view class="feedbackResult" v-if="item.status"> <view class="feedbackResult">
<u-collapse> <u-collapse>
<u-collapse-item :open="true" title="处理结果"> <u-collapse-item :open="true" title="处理结果">
<u-form :model="item" ref="item" class="selfForm"> <u-form :model="item" ref="item" class="selfForm">
@ -109,7 +103,7 @@
{{ item.replay_at }} {{ item.replay_at }}
</u-form-item> </u-form-item>
<u-form-item label="反馈内容:" label-width="150" prop="feedback"> <u-form-item label="反馈内容:" label-width="150" prop="feedback">
{{ item.reply }} {{ item.content }}
</u-form-item> </u-form-item>
</u-form> </u-form>
</u-collapse-item> </u-collapse-item>
@ -128,7 +122,7 @@
{{ item.replay_at }} {{ item.replay_at }}
</u-form-item> </u-form-item>
<u-form-item label="反馈内容:" label-width="150" prop="feedback"> <u-form-item label="反馈内容:" label-width="150" prop="feedback">
{{ item.reply }} {{ item.content }}
</u-form-item> </u-form-item>
</u-form> </u-form>
</u-collapse-item> </u-collapse-item>
@ -136,39 +130,33 @@
</view> </view>
</view> </view>
</view> </view>
<view class="empty" v-if="OrderType != 0 && total == 0"> <view class="empty" v-if="OrderType == 2">
<u-empty text="暂无信息" mode="list"></u-empty>
</view>
<!-- <view class="empty" v-if="OrderType == 2">
<image class="emptyImg" :src="$picUrl + '/static/news1/feedbackempty.png'" mode="widthFix"></image> <image class="emptyImg" :src="$picUrl + '/static/news1/feedbackempty.png'" mode="widthFix"></image>
<view class="emptytext"> <view class="emptytext">
还没有反馈内容 还没有反馈内容
</view> </view>
</view> --> </view>
</view> </view>
</template> </template>
<script> <script>
import Config from '@/core/config'
import * as feedback from '@/api/feedback' import * as feedback from '@/api/feedback'
export default { export default {
data() { data() {
return { return {
action: '',
header: '',
OrderType: 0, OrderType: 0,
shop_id: '', shop_id: '',
total: 1,
form: { form: {
type: '', type: '',
shop: '', shop: '',
shopText: '', shopText: '',
comment: '', comment: '',
user_name: '', name: '',
phone: '' phone: ''
}, },
feedBackList: [], feedBackList: [],
page: 1,
checkboxList1: [{ checkboxList1: [{
name: '投诉', name: '投诉',
val: 1 val: 1
@ -183,12 +171,10 @@ export default {
} }
], ],
checkboxList2: [{ checkboxList2: [{
name: '门店', name: '门店'
val: 1
}, },
{ {
name: '其他', name: '其他'
val: 2
}, },
], ],
typeShow: false, typeShow: false,
@ -198,25 +184,11 @@ export default {
result: {} result: {}
}; };
}, },
onReady() {
this.action = (Config.get('apiUrl') + 'upload/image').replace("index.php?s=/", "")
this.header = {
'Storeid': uni.getStorageSync('Store').storeInfo.store_id,
'Access-Token': uni.getStorageSync('AccessToken'),
'platform': "MP-WEIXIN",
}
},
onShow() { onShow() {
this.getShopList() this.getShopList()
}, },
onLoad(params) { onLoad(params) {
},
onReachBottom() {
if (this.feedBackList.length < this.total && this.OrderType!=0) {
this.pageNum++;
this.getFeedBack(this.OrderType)
}
}, },
methods: { methods: {
getShopList() { getShopList() {
@ -248,7 +220,7 @@ export default {
}) })
return return
} }
if (this.form.mobile && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.mobile))) { if (this.form.phone && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.phone))) {
uni.showToast({ uni.showToast({
title: '手机号格式不正确！', title: '手机号格式不正确！',
icon: 'none', icon: 'none',
@ -260,10 +232,7 @@ export default {
shop_id: that.shop_id, shop_id: that.shop_id,
type: that.form.type, type: that.form.type,
object_type: that.form.shop, object_type: that.form.shop,
content: that.form.comment, content: that.form.comment
user_name: that.form.user_name,
mobile: that.form.mobile,
image_id: that.image_id
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
feedback.add(params) feedback.add(params)
@ -281,7 +250,6 @@ export default {
*/ */
onOrderTab(type) { onOrderTab(type) {
this.OrderType = type; this.OrderType = type;
this.pageNum = 1
this.feedBackList = [] this.feedBackList = []
if (type != 0) { if (type != 0) {
this.getFeedBack(type) this.getFeedBack(type)
@ -293,15 +261,14 @@ export default {
const that = this const that = this
let params = { let params = {
is_my: 0, is_my: 0,
page: that.pageNum page: that.page
} }
params.is_my = type == 1 ? 0 : 1 params.is_my = type == 1 ? 0 : 1
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
feedback.list(params) feedback.list(params)
.then(res => { .then(res => {
if (res.status == 200) { if (res.status == 200) {
that.total = res.data.list.total that.feedBackList = res.data.list.data
that.feedBackList = that.feedBackList.concat(res.data.list.data)
} }
}) })
.catch(reject) .catch(reject)
@ -476,8 +443,8 @@ page {
} }
.introContent { .introContent {
margin-top: 16rpx;
margin: 16rpx 30rpx 30rpx 30rpx; margin: 16rpx 30rpx 30rpx 30rpx;
padding-bottom: 160rpx;
.introText { .introText {
font-size: 26rpx; font-size: 26rpx;
@ -488,24 +455,16 @@ page {
} }
.submitBtn-box {
width: 100%;
position: fixed;
left: 0;
z-index: 88;
bottom: 0;
padding: 30rpx 32rpx;
background: #fff;
}
.submitBtn { .submitBtn {
height: 100rpx; height: 100rpx;
background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%); background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
border-radius: 52px 52px 52px 52px; border-radius: 52px 52px 52px 52px;
opacity: 1; opacity: 1;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
margin: 32rpx 30rpx 30rpx 30rpx;
text-align: center; text-align: center;
line-height: 100rpx; line-height: 100rpx;
} }
@ -566,14 +525,7 @@ page {
color: #FF4D4D; color: #FF4D4D;
flex-shrink: 1; flex-shrink: 1;
} }
.fbFlag2{
border: 1px solid #41B4EC;
color: #41B4EC;
}
.fbFlag3{
border: 1px solid #2DC37F;
color: #2DC37F
}
.fbTitleText { .fbTitleText {
flex: 1; flex: 1;
font-size: 28rpx; font-size: 28rpx;
@ -629,4 +581,18 @@ page {
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
height: calc(100vh - 102rpx); height: calc(100vh - 102rpx);
}</style>
.emptyImg {
width: 210rpx;
}
.emptytext {
font-size: 32rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #717171;
margin-top: 36rpx;
}
}
</style>

62
pages/news1/text.vue
Unescape View File

@ -1,52 +1,60 @@
<template> <template>
<view> <view>
<view class="con">{{ content }}</view> <view class="title">{{title}}</view>
<view class="con">用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议用户服务协议</view>
</view> </view>
</template> </template>
<script> <script>
import * as help from '@/api/help' import * as feedback from '@/api/feedback'
export default { export default {
data() { data() {
return { return {
pageFlag: 1, title:'用户协议'
content: ''
}; };
}, },
onShow() { onShow() {
this.getTextData() this.getShopList()
}, },
onLoad(params) { onLoad(params) {
let that = this
that.pageFlag = params.pageFlag
uni.setNavigationBarTitle({
title: that.pageFlag == 1 ? '用户服务协议' : that.pageFlag == 2 ? '隐私政策' : '关于我们'
})
}, },
methods: { methods: {
async getTextData() { getShopList() {
uni.showLoading({
title: "加载中" const that = this
}) // that.shopList = []
let typeVal = this.pageFlag == 1 ? 'user' : this.pageFlag == 2 ? 'policy' : 'about' // return new Promise((resolve, reject) => {
let { // feedback.shopList()
status, // .then(res => {
data // if (res.data.length > 0) {
} = await help.getAgreement({ type: typeVal }); // for (var i = 0; i < res.data.length; i++) {
if (status == 200) { // let obj = {
uni.hideLoading(); // text: res.data[i].shop_name,
this.content = data.detail.content // id: res.data[i].shop_id
} // }
// that.shopList.push(obj)
// }
// }
// })
// .catch(reject)
// })
}, },
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.title{
.con { font-size: 30rpxrpx;
font-weight: bold;
text-align: center;
margin: 10rpx 20rpx;
}
.con{
font-size: 28rpx; font-size: 28rpx;
padding: 20rpx 40rpx 40rpx; padding: 0 40rpx 40rpx;
line-height: 28px; line-height: 28px;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save