Skip to content

M
msjf-customized
提交 80ed031f authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

添加订单详情查询功能

上级 6df6e460
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 272 行增加 和 86 行删除
src/pages/customized/my.vue
浏览文件 @ 80ed031f
......@@ -76,6 +76,11 @@ let initHavePage = async () => {
currencyPage.value = res.data.currencyPage;
uni.$emit('previewData', { previewData: res.data });
};
uni.$on('updateData', function() {
initHavePage();
});
initHavePage();
</script>
......
src/pages/customized/order.vue
浏览文件 @ 80ed031f
......@@ -34,7 +34,7 @@
<text>订单编号：{{ item.orderSn }}</text>
<text>合计：￥{{ item.actualPrice.toFixed(2) }}</text>
</view>
<view v-for="(item1, i) in item.goodsList" class="or-bottom">
<view v-for="(item1, i) in item.goodsList" class="or-bottom" @click="toggle('right', item1.id)">
<view class="or-left"><image :src="item1.picUrl" class="or-left-image" /></view>
<view class="order-right">
<text class="details-top">{{ item1.goodsName }}</text>
......@@ -47,42 +47,53 @@
</view>
</view>
</view>
<uni-load-more status="no-more" style="width: 100%;"></uni-load-more>
<!-- <text style="font-size: 24rpx; padding: 0 30rpx; color:#ccc">订购 时间:2022.8.24</text> -->
<view class="qr-code">
<text style="margin-right: 60rpx;">科 技 赋 能</text>
<image src="../../static/msjf-picture/msjf-13.png" mode="widthFix" style="width: 144rpx;"></image>
<text style="margin-left: 60rpx;">高 端 酱 酒</text>
</view>
<!-- <view style="width: 100%; height: 200rpx;"></view> -->
<!-- <view class="footer">
<image src="../../static/msjf-picture/msjf-05.jpg" mode="" class="bg-imag"></image>
<image src="../../static/msjf-picture/msjf-10.png" mode="widthFix" class="btn-image"></image>
</view> -->
<uni-popup ref="popup" background-color="#f2f2f2">
<scroll-view v-if="JSON.stringify(detailData) != '[]'" scroll-y="true" style="height: 100vh; box-sizing: border-box; padding-bottom: 40rpx;">
<view v-for="(item, i) in detailData" class="msjf-detail">
<view class="detail-list">
<view class="label">序列号</view>
<view class="text">{{ item.sequenceCode }}</view>
</view>
<view class="detail-list">
<view class="label">是否开瓶</view>
<view class="text">{{ item.ifDeCap ? '已开瓶' : '未开瓶' }}</view>
</view>
<view class="detail-list">
<view class="label">开瓶时间</view>
<view class="text">{{ item.deCapTime }}</view>
</view>
<view class="detail-list">
<view class="label">开瓶手机号</view>
<view class="phone-list">
<view v-for="phone in item.phoneList.length" class="text">{{ item.phoneList[phone - 1] }}</view>
</view>
</view>
</view>
</scroll-view>
<uni-load-more v-else status="no-more"></uni-load-more>
</uni-popup>
</view>
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { getMSJFList } from '@/services/api';
import { getMSJFList, getMSJFDetail } from '@/services/api';
import headerVue from '@/pages/header/index.vue';
let color = ref('#a27443');
// 订单数据
let orderData = ref();
// 图片标题
// let titleImg = ref([
// {
// imgUrl: '/static/msjf-picture/msjf-14.png'
// },
// {
// imgUrl: '/static/msjf-picture/msjf-18.png'
// },
// {
// imgUrl: '/static/msjf-picture/msjf-19.png'
// }
// ]);
let detailData = ref();
let num = 1
// let add = () => {
// num.value++;
......@@ -92,6 +103,12 @@ let orderData = ref();
// if (num.value < 1) return;
// else num.value--;
// };
let popup = ref()
let toggle = (type: string, id: number) => {
popup.value?.open(type)
initMSJFDetail(id)
}
// 获取订单数据
let initMSJFList = async () => {
......@@ -100,6 +117,14 @@ let initMSJFList = async () => {
};
initMSJFList();
// 单个商品详情
let initMSJFDetail = async (id: any) => {
let res: any = await getMSJFDetail({orderGoodsId: id})
if(res.data.errno === 0 ) {
detailData.value = res.data.data.list
}
}
</script>
<style lang="scss" scoped>
......@@ -107,6 +132,11 @@ page {
background-color: #f2f2f2;
}
:deep(.uni-popup .uni-popup__wrapper) {
width: 500rpx;
// padding: 0 40rpx;
}
.status_bar {
height: var(--status-bar-height);
width: 100%;
......@@ -257,5 +287,45 @@ page {
width: 200rpx;
}
}
.msjf-detail {
font-size: 14px;
// padding: 20rpx;
background-color: #fff;
margin-bottom: 40rpx;
.detail-list {
box-sizing: border-box;
display: flex;
justify-content: flex-start;
border-bottom: 1px solid #ccc;
.label {
width: 168rpx;
height: 40rpx;
line-height: 40rpx;
text-align: right;
margin-right: 10rpx;
}
.text {
padding-left: 20rpx;
width: 280rpx;
min-height: 40rpx;
max-height: 80rpx;
line-height: 40rpx;
text-align: left;
overflow: hidden;
border-left: 1px solid #ccc;
}
.phone-list {
.text {
width: 230rpx;
min-height: 40rpx;
max-height: 80rpx;
line-height: 40rpx;
text-align: left;
overflow: hidden;
}
}
}
}
}
</style>
src/pages/customized/queryRecord.vue
浏览文件 @ 80ed031f
......@@ -6,9 +6,10 @@
<view class="query-record">
<view class="content"><uni-search-bar cancelButton="always" v-model="searchValue" placeholder="SN" @confirm="confirm" /></view>
</view>
<view v-if="queryRecord != '[]'">
<view v-for="(item, i) in queryRecord" :key="i">
<view class="query-list">
<image :src="baseURL + item.goodsPicUrl" mode="scaleToFill" />
<image :src="baseURL + downUrl + item.goodsPicUrl" mode="scaleToFill" />
<view class="record">
<text class="record-text">{{ item.goodsName }}</text>
<view class="record-center">
......@@ -25,6 +26,8 @@
<text style="font-size: 26rpx; color: #313131; margin: 20rpx 60rpx">订单编号：{{ item.orderSn }}</text>
</view>
</view>
<uni-load-more v-else status="no-more"></uni-load-more>
</view>
<!-- <view class="footer">
<button class="btn-footer" @click="importExcel">
<image src="/static/msjf-picture/msjf-01.png" mode="scaleToFill"></image>
......@@ -43,28 +46,28 @@ import { ref } from 'vue';
import headerVue from '@/pages/header/index.vue';
import { searchSnInfo } from '@/services/api';
import { baseURL } from '@/services/request';
import { onLoad } from '@dcloudio/uni-app';
let color = ref('#a27443');
let used = ref(false);
let downUrl = '/wx/storage/fetch/';
// let used = ref(false);
let queryRecord = ref();
let queryPwd = () => {
uni.navigateTo({
url: './queryPwd'
});
};
// let queryPwd = () => {
// uni.navigateTo({
// url: './queryPwd'
// });
// };
let importExcel = () => {
uni.navigateTo({
url: './importExcel'
});
};
// let importExcel = () => {
// uni.navigateTo({
// url: './importExcel'
// });
// };
let confirm = async (data: any) => {
// MSJF-0000001
if (data.value) {
let res: any = await searchSnInfo({ code: data.value });
if (res.data.errno == 0) {
......
src/pages/customized/uploadImageVideo.vue
浏览文件 @ 80ed031f
......@@ -34,7 +34,6 @@ let downUrl = '/wx/storage/fetch/';
onLoad((options: any) => {
if (options) {
console.log(options);
type.value = JSON.parse(options.type);
if (type.value == 'currency') {
// 通用定制模板
......@@ -77,6 +76,9 @@ let uploadImage = () => {
if (templateId.value) {
uni.chooseImage({
success(res: any) {
uni.showLoading({
title: '上传中...'
});
for (let i = 0; i < res.tempFilePaths.length; i++) {
uni.uploadFile({
url: baseURL + '/wx/storage/upload',
......@@ -89,7 +91,7 @@ let uploadImage = () => {
type: data.type,
sort: imageVideoData.value.length
});
console.log(imageVideoData.value);
uni.hideLoading();
},
fail(res: any) {
console.log(res);
......@@ -196,8 +198,8 @@ let save = () => {
success(res: any) {
if (res.data.errno != 502) {
uni.showLoading({
title: '上传中',
success: () => {
title: '上传中'
});
idArr.push(res.data);
if (Number(key) == imageVideoData.value.length - 1) {
saveCustomPage({ fileIds: idArr }).then((res: any) => {
......@@ -209,8 +211,6 @@ let save = () => {
});
}
}
});
}
},
fail(res: any) {
console.log(res);
......@@ -220,36 +220,6 @@ let save = () => {
}
};
let pro = (idArr: any) => {
// if (Number(key) == imageVideoData.value.length - 1) {
// console.log(key, count, imageVideoData.value.length - 1);
if (type.value == 'currency') {
console.log(idArr, '添加');
setTimeout(() => {
templateAdd({ pageComponentList: idArr }).then((res: any) => {
if (res.data.errno == 0) {
uni.hideLoading();
// imageVideoData.value = [];
// close();
}
});
}, 50);
} else {
console.log('編輯', idArr);
setTimeout(() => {
updateCustomPage({ id: templateId.value, pageComponentList: idArr }).then((res: any) => {
if (res.data.errno == 0) {
console.log('你快一点吗！', idArr);
uni.hideLoading();
// imageVideoData.value = [];
// close();
}
});
}, 50);
}
// }
};
// 替换图片
let replaceImg = (index: number) => {
if (imageVideoData.value[index]['type'] == 'image/jpeg') {
......@@ -264,7 +234,6 @@ let replaceImg = (index: number) => {
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['camera', 'album'], //从相册选择
success: function(res: any) {
console.log(res);
uni.uploadFile({
url: baseURL + '/wx/storage/upload',
filePath: res.tempFilePaths[0],
......@@ -272,7 +241,6 @@ let replaceImg = (index: number) => {
success: (res: any) => {
let data = JSON.parse(res.data).data;
imageVideoData.value[index]['path'] = baseURL + data.url;
console.log(imageVideoData.value);
},
fail(res: any) {
console.log(res);
......@@ -348,10 +316,11 @@ let close = () => {
uni.navigateBack({
delta: 1,
success: () => {
let pages: any = getCurrentPages();
// let currPage = pages[pages.length - 1]; //当前页面
let prePage = pages[pages.length - 2]; //上一个页面
prePage.initHavePage();
uni.$emit('updateData')
// let pages: any = getCurrentPages();
// // let currPage = pages[pages.length - 1]; //当前页面
// let prePage = pages[pages.length - 2]; //上一个页面
// prePage.$vm.initHavePage();
}
});
};
......
src/pages/customized/uploadPreview.vue
浏览文件 @ 80ed031f
......@@ -4,7 +4,7 @@
<view v-for="(item, index) in previewData" :key="item.id">
<view class="preview-list">
<view style="transform:scale(0.7)">
<radio-group @change="change"><radio value="defValue" :checked="item.check" :disabled="item.check" @click="radioChange(item, index)" /></radio-group>
<radio-group><radio value="defValue" :checked="item.check" :disabled="item.check" @click="radioChange(item, index)" /></radio-group>
</view>
<view class="img"><image :src="baseURL + downUrl + item.cover" mode="aspectFill" class="preview-img" /></view>
<view class="preview-content">
......@@ -37,24 +37,19 @@ let previewData = ref();
// 模板子列表数据
let pageData = ref();
let change = (data: string) => {
console.log(data);
}
let radioChange = (data: any, i: number) => {
if (data.check == true) return;
uni.showModal({
content: '确认设为默认？',
success(res) {
if (res.confirm) {
console.log('默认');
customPageChecked({ customPageId: data.id }).then((res: any) => {
if (res.data.errno == 0) {
emits('initHavePage');
}
});
} else {
location.reload()
location.reload();
}
}
});
......@@ -104,8 +99,6 @@ let initHavePage = async () => {
if (previewData.value[s].id == data.previewData.checkedId) previewData.value[s]['check'] = true;
else previewData.value[s]['check'] = false;
}
// checkId.value = data.previewData.checkId;
console.log(previewData.value, 'zzz');
});
};
initHavePage();
......
src/services/api.ts
浏览文件 @ 80ed031f
......@@ -27,7 +27,7 @@ export let getPageComponent = (data: any) => request('/wx/customPage/getPageComp
export let deletePageComponent = (data: any) => request('/wx/customPage/delete', 'POST', data);
// 查询记录
export let searchSnInfo = (sn: string) => request('/wx/orderSequence/searchRecordInfo', 'GET', sn);
export let searchSnInfo = (data: any) => request('/wx/orderSequence/searchRecordInfo', 'GET', data);
// 下载接口
export let downLoad = (imgUrl: string) => request('/wx/storage/download/' + imgUrl, 'GET');
......@@ -37,3 +37,6 @@ export let singleUpload = (data: any) => request('/wx/customPage/update', 'POST'
// 设置默认 http://127.0.0.1:8080/wx/customPage/checked
export let customPageChecked = (data: any) => request('/wx/customPage/checked', 'POST', data)
// 获取开瓶信息
export let getMSJFDetail = (data: any) => request('/wx/order/MSJFDetail', 'GET', data)
src/uni_modules/uni-load-more/changelog.md 0 → 100644
浏览文件 @ 80ed031f
## 1.3.3（2022-01-20）
- 新增 showText属性 ，是否显示文本
## 1.3.2（2022-01-19）
- 修复 nvue 平台下不显示文本的bug
## 1.3.1（2022-01-19）
- 修复 微信小程序平台样式选择器报警告的问题
## 1.3.0（2021-11-19）
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
## 1.2.1（2021-08-24）
- 新增 支持国际化
## 1.2.0（2021-07-30）
- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.1.8（2021-05-12）
- 新增 组件示例地址
## 1.1.7（2021-03-30）
- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
## 1.1.6（2021-02-05）
- 调整为uni_modules目录规范
src/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json 0 → 100644
浏览文件 @ 80ed031f
{
"uni-load-more.contentdown": "Pull up to show more",
"uni-load-more.contentrefresh": "loading...",
"uni-load-more.contentnomore": "No more data"
}
src/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js 0 → 100644
浏览文件 @ 80ed031f
import en from './en.json'
import zhHans from './zh-Hans.json'
import zhHant from './zh-Hant.json'
export default {
en,
'zh-Hans': zhHans,
'zh-Hant': zhHant
}
src/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json 0 → 100644
浏览文件 @ 80ed031f
{
"uni-load-more.contentdown": "上拉显示更多",
"uni-load-more.contentrefresh": "正在加载...",
"uni-load-more.contentnomore": "没有更多数据了"
}
src/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json 0 → 100644
浏览文件 @ 80ed031f
{
"uni-load-more.contentdown": "上拉顯示更多",
"uni-load-more.contentrefresh": "正在加載...",
"uni-load-more.contentnomore": "沒有更多數據了"
}
src/uni_modules/uni-load-more/package.json 0 → 100644
浏览文件 @ 80ed031f
{
"id": "uni-load-more",
"displayName": "uni-load-more 加载更多",
"version": "1.3.3",
"description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
"keywords": [
"uni-ui",
"uniui",
"加载更多",
"load-more"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
},
"uni_modules": {
"dependencies": ["uni-scss"],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}
\ No newline at end of file
src/uni_modules/uni-load-more/readme.md 0 → 100644
浏览文件 @ 80ed031f
### LoadMore 加载更多
> **组件名：uni-load-more**
> 代码块： `uLoadMore`
用于列表中，做滚动加载使用，展示 loading 的各种状态。
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论