theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade version 8.18

Browse Source
This commit is contained in:
ghusermoon 2020-08-18 17:42:26 +08:00
parent 2a382aa0b4
commit cb0a6fafa3
9 changed files with 240 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/api/user.js
View File

@ -353,6 +353,12 @@ export default {
code: code, code: code,
}); });
}, },
// 获取可送洗商品
getSendOrderList({ page }) {
return vm.$u.post('member/getSendOrderList', {
page: page,
});
},
// 送洗列表-平台订单 实体店订单 // 送洗列表-平台订单 实体店订单
sendLaundryOrderList({ type, page }) { sendLaundryOrderList({ type, page }) {
return vm.$u.post('member/sendLaundryOrderList', { return vm.$u.post('member/sendLaundryOrderList', {

16
components/shop/special-shop/index.vue
View File

@ -1,26 +1,26 @@
<template> <template>
<view class="special"> <view class="special">
<view v-if="type == 'spike'"> <view v-if="type == 'spike'" @click="spikeGoods">
<image :src="item.groupbuy_image1" @click="spikeGoods"></image> <image :src="item.groupbuy_image1"></image>
<view class="right"> <view class="right">
<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view> <view class="name u-line-1">{{ item.goods_name }}</view>
<view class="price"> <view class="price">
<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view> <view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
<view class="goods-price">￥{{ item.goods_price }}</view> <view class="goods-price">￥{{ item.goods_price }}</view>
</view> </view>
<view class="buy"> <view class="buy">
<view class="num">剩余{{ item.inventory }}件</view> <view class="num">剩余{{ item.inventory }}件</view>
<view class="btn" @click="spikeGoods">立即购买</view> <view class="btn">立即购买</view>
</view> </view>
</view> </view>
</view> </view>
<view v-if="type == 'group'"> <view v-if="type == 'group'" @click="toDetailsPage">
<image :src="item.pintuan_image" @click="toDetailsPage"></image> <image :src="item.pintuan_image"></image>
<view class="right"> <view class="right">
<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view> <view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
<view class="price group"> <view class="price group">
<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view> <view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
<view class="btn" @click="toDetailsPage">立即拼团</view> <view class="btn">立即拼团</view>
</view> </view>
</view> </view>
</view> </view>

2
pageC/spike/index.vue
View File

@ -23,7 +23,7 @@
</view> </view>
</template> </template>
<script> <script>
import SpecialGoods from "../../components/shop/special-shop/index" import SpecialGoods from "@/components/shop/special-shop/index"
export default { export default {
data() { data() {
return { return {

99
pageE/mine/ArticleDetails.vue
View File

@ -1,38 +1,14 @@
<template> <template>
<view> <view class="article-details">
<view class="header" v-if="type == 2">
<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
<view class="title">德铭阳光</view>
<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
</view>
<rich-text :nodes="nodes" v-if="type != 2"></rich-text>
<view class="main" v-if="type == 2">
<view @click="show = true">
<text>产品介绍</text>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
<view>
<text>版本更新</text>
<text class="tips">已是最新版本</text>
</view>
</view>
<u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
<view class="u-content">
<rich-text :nodes="nodes"></rich-text> <rich-text :nodes="nodes"></rich-text>
</view> </view>
</u-popup>
</view>
</template> </template>
<script> <script>
import common from '@/static/js/common.js' import common from '@/static/js/common.js'
export default { export default {
data() { data() {
return { return {
type: 1,
nodes: "", nodes: "",
version: "",
show: false,
phone_type: "",
} }
}, },
onLoad(option) { onLoad(option) {
@ -41,17 +17,6 @@ export default {
if(option.id) this.getUseHelpInfo(option.id); if(option.id) this.getUseHelpInfo(option.id);
if(option.type == 1) this.certificateInfo(); if(option.type == 1) this.certificateInfo();
if(option.type == 2) this.getAboutUsInfo(); if(option.type == 2) this.getAboutUsInfo();
this.type = option.type;
this.getVersion();
this.phone_type = this.$u.os();
},
onBackPress() {
if (this.show) {
this.show = !this.show;
} else {
return false;
}
return true;
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
console.log(e); console.log(e);
@ -88,64 +53,16 @@ export default {
} }
}) })
}, },
// 检查版本号
getVersion() {
this.$u.post("Specialci/checkVersion",{app_version: 1}).then(res => {
console.log(res);
this.version = res.data.app_version;
})
}
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page { // page {
background-color: #f2f2f2; // background-color: #ECECEC;
} // }
.header { .article-details {
width: 500rpx; min-height: calc(100vh - var(--window-top));
margin: 0 auto; background: #ECECEC;
padding: 30rpx; padding: 20rpx 35rpx 0;
text-align: center;
.tit-img {
width: 200rpx;
height: 200rpx;
}
.title {
margin: 18rpx 0;
font-weight: bold;
font-size: 26rpx;
letter-spacing: 2rpx;
}
.tit-info {
font-size: 22rpx;
color: #666;
}
}
.main {
margin: 20rpx 0;
& > view {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 100rpx;
padding: 0 20rpx;
line-height: 100rpx;
color: #333;
font-size: 30rpx;
background-color: #fff;
border-bottom: 1px solid #f2f2f2;
}
.tips {
color: #999;
font-size: 22rpx;
}
}
.u-content {
padding: 20rpx;
font-size: 30rpx;
text-indent: 1rem;
line-height: 1.2;
} }
</style> </style>

3
pageE/setting/Index.vue
View File

@ -64,7 +64,8 @@
}, },
{ {
title: '关于我们', title: '关于我们',
link: '../mine/ArticleDetails?type=2' // link: '../mine/ArticleDetails?type=2'
link: '/pageE/setting/version'
}, },
{ {
title: '帮助与反馈', title: '帮助与反馈',

53
pageE/setting/updateVersion.vue Normal file
View File

@ -0,0 +1,53 @@
<template>
<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
<view class="u-update-content">
<rich-text :nodes="content"></rich-text>
</view>
</u-modal>
</template>
<script>
export default {
data() {
return {
show: true,
// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
content: `
1. 新增几个bug<br>
2. 新增Modal模态框组件<br>
3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
`,
}
},
onReady() {
this.show = true;
},
methods: {
cancel() {
this.closeModal();
},
confirm() {
this.closeModal();
},
closeModal() {
uni.navigateBack();
}
}
}
</script>
<style scoped lang="scss">
page{
background-color: rgba(0,0,0,0);
}
.u-full-content {
background-color: #00C777;
}
.u-update-content {
font-size: 26rpx;
color: $u-content-color;
line-height: 1.7;
padding: 30rpx;
}
</style>

108
pageE/setting/version.vue Normal file
View File

@ -0,0 +1,108 @@
<template>
<view class="version">
<view class="header">
<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
<view class="title">德铭阳光</view>
<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
</view>
<view class="main">
<view @click="viewAboutUs">
<text class="title">产品介绍</text>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
<view class="version-view">
<text class="title">版本更新</text>
<text class="tips" v-if="0">已是最新版本</text>
<text class="tips" v-else @click="updateVersion">1.1.10</text>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
version: "",
phone_type: "",
}
},
onLoad() {
this.getVersion();
this.phone_type = this.$u.os();
},
methods: {
// 检查版本号
getVersion() {
this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => {
// console.log(res);
this.version = res.data.app_version;
})
},
viewAboutUs() {
this.$u.route('/pageE/mine/ArticleDetails', {
type: 2
});
},
updateVersion() {
this.$u.route('/pageE/setting/updateVersion');
}
}
};
</script>
<style lang="scss" scoped>
.header {
width: 500rpx;
margin: 0 auto;
padding: 30rpx;
text-align: center;
.tit-img {
width: 200rpx;
height: 200rpx;
}
.title {
margin: 18rpx 0;
font-weight: bold;
font-size: 26rpx;
letter-spacing: 2rpx;
}
.tit-info {
font-size: 22rpx;
color: #666;
}
}
.main {
margin: 20rpx 0;
& > view {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 100rpx;
padding: 0 20rpx;
line-height: 100rpx;
color: #333;
font-size: 30rpx;
background-color: #fff;
border-bottom: 1px solid #f2f2f2;
.title {
width: 200rpx;
}
}
.tips {
color: #999;
font-size: 22rpx;
}
.version-view {
.tips {
flex: 1;
text-align: right;
}
}
}
.u-content {
padding: 20rpx;
font-size: 30rpx;
text-indent: 1rem;
line-height: 1.2;
}
</style>

31
pageE/tool/WashOrder.vue
View File

@ -160,7 +160,7 @@
<text>选择订单</text> <text>选择订单</text>
<u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon> <u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon>
</view> </view>
<scroll-view scroll-y class="order-list"> <scroll-view scroll-y class="order-list" @scrolltolower="onreachBottom">
<u-radio-group v-model="value" @change="radioChange"> <u-radio-group v-model="value" @change="radioChange">
<view v-for="(items, index) in orderList" :key="index" class="order-item"> <view v-for="(items, index) in orderList" :key="index" class="order-item">
<view class="store"> <view class="store">
@ -195,6 +195,7 @@
</view> </view>
</view> </view>
</u-radio-group> </u-radio-group>
<u-loadmore :status="loadStatu" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20"></u-loadmore>
</scroll-view> </scroll-view>
<view class="order-btn" @click="confirm">确认</view> <view class="order-btn" @click="confirm">确认</view>
</view> </view>
@ -222,7 +223,7 @@ export default {
}], }],
typeList: [], // 商品类型列表 typeList: [], // 商品类型列表
orderList: [], // 商品列表 orderList: [], // 商品列表
page: 0, page: 1,
current: 0, current: 0,
swiperCurrent: 0, swiperCurrent: 0,
areaList: [], //　地址列表 areaList: [], //　地址列表
@ -244,6 +245,8 @@ export default {
name: 'common', // 其他图片 name: 'common', // 其他图片
}, },
debounce: true, debounce: true,
timer: true,
loadStatu: 'loadmore'
} }
}, },
onShow() { onShow() {
@ -284,17 +287,37 @@ export default {
// console.log(e); // console.log(e);
this.type = e[0]; this.type = e[0];
}, },
onreachBottom() {
if(!this.timer) return false;
this.timer = false;
this.loadStatu = "loading";
this.page++;
this.getOrderList({ load: 'loadmore' }).then(length => {
this.loadStatu = "nomore";
if(length == 0) this.page--;
}).catch(() => {
this.loadStatu = "nomore";
this.page--;
})
},
async getOrderList({ load = 'reload' } = {}) { async getOrderList({ load = 'reload' } = {}) {
// const res = await this.$u.api.getSendOrderList({
// page: this.page,
// })
const res = await this.$u.api.getOrderList({ const res = await this.$u.api.getOrderList({
page: this.page, page: this.page,
// type: '40',
}) })
this.timer = true; this.timer = true;
// if(res.errCode == 0) {
// if(load == 'reload') this.orderList = res.data.order_list;
// else this.orderList.push(...res.data.order_list);
// }
// return res.data.order_list.length;
if(res.errCode == 0) { if(res.errCode == 0) {
if(load == 'reload') this.orderList = res.data; if(load == 'reload') this.orderList = res.data;
else this.orderList.push(...res.data); else this.orderList.push(...res.data);
} }
return res; return res.data.length;
}, },
submitImage() { submitImage() {
// console.log(222); // console.log(222);

36
pages.json
View File

@ -610,16 +610,7 @@
"titleSize": "36px", "titleSize": "36px",
"titleNView": { "titleNView": {
"titleColor": "#333333", "titleColor": "#333333",
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF"
"buttons": [
{
"width": "0",
"type":"none",
"text":"关闭",
"float":"right",
"fontSize":"14"
}
]
} }
} }
} }
@ -1002,6 +993,31 @@
} }
} }
}, },
{
"path": "setting/version",
"style": {
"navigationBarTitleText": "关于我们",
"app-plus": {
"titleSize": "36px",
"titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF"
}
}
}
},
{
"path": "setting/updateVersion",
"style": {
"navigationStyle": "custom", // 取消本页面的导航栏
"app-plus": {
"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
"background": "transparent", // 背景透明
"backgroundColor": "rgba(0,0,0,0)", // 背景透明
"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
}
}
},
{ {
"path": "order/Index", "path": "order/Index",
"style": { "style": {