111111
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
module.exports = {
|
||||
// baseUrl: 'http://192.168.2.117:7211', // 本地
|
||||
// baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器
|
||||
// baseUrl: 'https://39.104.100.138/lpkapi', // 测试服务器
|
||||
// baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
|
||||
baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
|
||||
// tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
|
||||
|
||||
@@ -112,6 +112,8 @@ export default {
|
||||
changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/" + params, params, {}, {}, true),
|
||||
// 订单发票获取授权页链接
|
||||
wxElectronicInvoice: (params = {}) => request.post("/empsreservoorder/wxElectronicInvoice", params, {}, {}),
|
||||
// 我的 失效商品
|
||||
vegeCellarInvalidList: (params = {}) => request.post("/lpkgoods/vegeCellarInvalidList", params, {}, {}),
|
||||
|
||||
// 查询发票列表
|
||||
getInvoiceList: (params = {}) => request.get("/customerinvoice/listInvoice/" + params, params),
|
||||
|
||||
@@ -52,7 +52,9 @@
|
||||
"mp-weixin" : {
|
||||
"appid" : "wx4724e3a3c27f36b5",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
"urlCheck" : false,
|
||||
"postcss" : true,
|
||||
"minified" : true
|
||||
},
|
||||
"usingComponents" : true,
|
||||
"lazyCodeLoading" : "requiredComponents"
|
||||
|
||||
@@ -421,6 +421,14 @@
|
||||
"navigationBarTitleText": "退款详情",
|
||||
"disableScroll": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/records/invalidGoods",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "失效商品",
|
||||
"enablePullDownRefresh" : false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -404,19 +404,24 @@
|
||||
<text
|
||||
style="margin-top: 16px;font-size: 18px;color: #101010;font-weight: 600;font-family: sans-serif;">感 谢 信</text>
|
||||
|
||||
<view style="display: flex;flex-direction: column; max-height:30vh; overflow-y: auto;">
|
||||
|
||||
<text
|
||||
style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px; ">尊敬的客户:
|
||||
<scroll-view scroll-y="true"
|
||||
style="display: flex;flex-direction: column;height:30vh; width: 100%; box-sizing: border-box; padding-left: 30px;padding-right: 30px;"
|
||||
bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
|
||||
<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
|
||||
<text style="margin-top: 12px;font-size: 14px;color: #333; ">尊敬的客户:
|
||||
    冬去春来,惠享“云菜窖”已伴随您走过了120个平凡又温馨的日子。首先,向您表达诚挚的谢意!正是您的支持与陪伴,激励着我们不断对产品和程序进行改进升级,也最终使得首期活动得以顺利开展,圆满闭窖。
|
||||
    “平价、优质、便捷”是我们给您的一贯承诺,在活动中,我们为您储备了基地直采的优质、实惠的蔬菜和水果,把绿色、新鲜、健康送到您的身边,我们与您和社区的关系更加紧密,也践行了助力乡村振兴的使命和担当。
|
||||
    在磨合中,我们也发现菜品品种需要丰富、服务水平需要加强、配送效率需要提升等不足。但是我们坚信,拥有热忱,便会进步,我们会总结经验,不断前行,在2024年10月份的“云菜窖”正式开窖时,给您更好的体验!
|
||||
    接下来,我们即将开启汇融惠农“家庭菜园”和“家庭果园”等活动,期待得到您的持续关注与支持,再次向您表达真诚的谢意,祝您生活愉快,身体健康!
|
||||
  更多精彩,请您扫码关注:</text>
|
||||
|
||||
<image src="../../static/materialCode.png" style="width: 80px;height: 80px; margin-top: 10px;"
|
||||
mode="aspectFit"></image>
|
||||
</view>
|
||||
<image src="../../static/materialCode.png"
|
||||
style="width: 80px;height: 80px; margin-top: 10px;" mode="aspectFit"></image>
|
||||
|
||||
|
||||
</scroll-view>
|
||||
|
||||
|
||||
<text style="margin-top: 25px;margin-bottom: 20px;border: 1px #FF9900 solid; color: #FF9900;font-size: 14px;
|
||||
border-radius: 20px;height: 40px; line-height: 40px;padding-left: 30px;padding-right: 30px;"
|
||||
|
||||
@@ -71,18 +71,36 @@
|
||||
</view>
|
||||
<text class="name">我的订单</text>
|
||||
</view>
|
||||
<!-- <view class="icon-name" @click="itemClick('已付款')">
|
||||
<view class="icon-name" @click="itemClick('已失效')">
|
||||
<view class="icon">
|
||||
<image class="img" src="../../static/img/record-query/paid.png" mode="aspectFill">
|
||||
<image class="img" src="../../static/img/record-query/invalid.png" mode="aspectFill">
|
||||
</image>
|
||||
</view>
|
||||
<text class="name">已付款</text>
|
||||
<text class="name">已失效</text>
|
||||
</view>
|
||||
<view class="icon-name"></view>
|
||||
<view class="icon-name"></view>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<!-- 失效菜品 -->
|
||||
<!-- <view class="icon-cow">
|
||||
<text class="title">失效菜品</text>
|
||||
<view class="group">
|
||||
|
||||
<view class="icon-name" @click="itemClick('已失效')">
|
||||
<view class="icon">
|
||||
<image class="img" src="../../static/img/record-query/invalid.png" mode="aspectFill">
|
||||
</image>
|
||||
</view>
|
||||
<text class="name">已失效</text>
|
||||
</view>
|
||||
<view class="icon-name"></view>
|
||||
<view class="icon-name"></view>
|
||||
<view class="icon-name"></view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="icon-name"></view>
|
||||
<view class="icon-name"></view>
|
||||
<view class="icon-name"></view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 转赠记录 -->
|
||||
<view class="icon-cow">
|
||||
<text class="title">转赠记录</text>
|
||||
@@ -125,8 +143,7 @@
|
||||
</view> -->
|
||||
|
||||
<button open-type="share" style="margin-right: -20px;height: 20px;line-height: 20px;">
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;">
|
||||
<view style="display: flex;flex-direction: row;align-items: center;">
|
||||
<text style="margin-right: 5px;color: #FF9900;font-size: 12px;">马上邀请</text>
|
||||
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;"></image>
|
||||
</view>
|
||||
@@ -455,6 +472,12 @@
|
||||
// })
|
||||
|
||||
|
||||
break;
|
||||
|
||||
case "已失效":
|
||||
uni.navigateTo({
|
||||
url: '/pages/records/invalidGoods',
|
||||
})
|
||||
break;
|
||||
case "待付款":
|
||||
|
||||
|
||||
107
pages/records/invalidGoods.vue
Normal file
107
pages/records/invalidGoods.vue
Normal file
@@ -0,0 +1,107 @@
|
||||
<template>
|
||||
<view
|
||||
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);"
|
||||
class="app">
|
||||
<!-- 有列表的时候用 :auto='false' 需要你在onload等调用reload方法 -->
|
||||
<z-paging ref="paging" v-model="data" @query="queryList" :pagingStyle='styleObject' :auto='true'>
|
||||
|
||||
<view v-for="(item,index) in data" style=" display: flex;flex-direction: column;margin-left: 10px;margin-right: 10px;
|
||||
padding: 5px 0px;">
|
||||
|
||||
<view class="item">
|
||||
|
||||
<view class="item_left">
|
||||
|
||||
<text class="item_left_text1">{{item.name}}</text>
|
||||
<text class="item_left_text2">失效时间:{{item.periodValidity}}</text>
|
||||
|
||||
</view>
|
||||
|
||||
<text class="item_right">份数:{{item.goodsNumber}}</text>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</z-paging>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
styleObject: {
|
||||
'padding-top': '10px',
|
||||
'padding-bottom': '10px',
|
||||
'background': '#F7F7F7'
|
||||
},
|
||||
data: []
|
||||
}
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
// 分页的请求
|
||||
queryList(pageNo, pageSize) {
|
||||
let _this = this
|
||||
_this.$api.vegeCellarInvalidList({
|
||||
"current": pageNo,
|
||||
"size": pageSize,
|
||||
"params": {
|
||||
"customerSid": getApp().globalData.sid
|
||||
|
||||
}
|
||||
}).then((resp) => {
|
||||
// 添加数据源
|
||||
this.$refs.paging.complete(resp.records)
|
||||
}).catch(e => {
|
||||
// 出错了,点击重试
|
||||
_this.$refs.paging.complete(false);
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.app {
|
||||
--bgcolor: #f2f2f2;
|
||||
|
||||
}
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 12px;
|
||||
|
||||
.item_left {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.item_left_text1 {
|
||||
font-size: 14px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.item_left_text2 {
|
||||
margin-top: 8px;
|
||||
font-size: 12px;
|
||||
color: #E36443;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.item_right {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -146,9 +146,9 @@
|
||||
|
||||
<text style="font-size: 16px;color: #fff; background-color: #FF9900; height: 5vh;line-height: 5vh;
|
||||
padding: 0px 20px;border-radius: 20px;" @click="continuePy" v-if="data.payStatus=='2'">继续付款</text>
|
||||
|
||||
<!--
|
||||
<text style="font-size: 16px;color: #fff; background-color: #FF9900; height: 5vh;line-height: 5vh;
|
||||
padding: 0px 20px;border-radius: 20px;margin-right: 10px;" @click="refund" >申请退款</text>
|
||||
padding: 0px 20px;border-radius: 20px;margin-right: 10px;" @click="refund" >申请退款</text> -->
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;" v-if="data.payStatus=='4'">
|
||||
<text style="font-size: 16px;color: #666; border: 1px #D3D3D3 solid; height: 5vh;line-height: 5vh;
|
||||
|
||||
BIN
static/img/record-query/invalid.png
Normal file
BIN
static/img/record-query/invalid.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Reference in New Issue
Block a user