From 7edaec69bd17721da4e9e8811985c0195581fd0a Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Tue, 28 Nov 2023 19:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/host.js | 4 +-
pages/CardDetail/components/index.scss | 23 +-
pages/CardDetail/index.vue | 78 ++++---
pages/OrderDetail/components/fomItem.vue | 5 +-
pages/OrderDetail/components/startService.vue | 215 ++++++++++++++++++
pages/OrderPage/index.vue | 4 +-
pages/UserCoupons/components/index.scss | 2 +
pages/UserCoupons/index.vue | 23 +-
.../components/uv-upload/uv-upload.vue | 8 +
9 files changed, 315 insertions(+), 47 deletions(-)
create mode 100644 pages/OrderDetail/components/startService.vue
diff --git a/config/host.js b/config/host.js
index 3468bee..1868074 100644
--- a/config/host.js
+++ b/config/host.js
@@ -1,8 +1,8 @@
// const host='http://192.168.2.92:9505/api'
-const host='https://weiyang.test.scyp.ink/api'
+const host='https://wechat.wwxtx.com/api'
// const host='https://bml.test.scyp.ink/api'
// const host='http://192.168.2.92:9503/api'
-const imghost='https://weiyang.test.scyp.ink/static/image'
+const imghost='https://wechat.wwxtx.com/static/image'
const title = '汪汪行天下'
const oss = 'https://pet-feed.'+'oss-cn-chengdu.aliyuncs.com'
// const codehost='http://code.baomingle.cn'
diff --git a/pages/CardDetail/components/index.scss b/pages/CardDetail/components/index.scss
index a145a17..1576808 100644
--- a/pages/CardDetail/components/index.scss
+++ b/pages/CardDetail/components/index.scss
@@ -182,7 +182,10 @@
}
.coupons-left{
width:170rpx;
- padding-top:0rpx;
+ //padding-top:0rpx;
+ height:100%;
+ display:flex;
+ align-items:center;
.coupons-big-title-group{
align-items: flex-end;
justify-content: center;
@@ -303,9 +306,13 @@
.coupons-left{
width:170rpx;
padding-top:0rpx;
+ height:100%;
+ display:flex;
+ align-items:center;
.coupons-big-title-group{
align-items: flex-end;
justify-content: center;
+ padding-bottom:10rpx;
.coupons-big-title{
text-align: center;
font-size: 62rpx;
@@ -510,6 +517,20 @@
border: 2rpx solid #262626;
box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0,0,0,0.06);
border-radius: 26rpx 26rpx 0rpx 0rpx;
+ .foot-menu-main-title{
+ margin-bottom:15rpx;
+ align-items: flex-end;
+ .main-title{
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #131313;
+ }
+ .main-price{
+ font-size: 36rpx;
+ font-weight: 500;
+ color: #F48021;
+ }
+ }
.foot-menu-checkbox{
margin-right:8rpx;
width: 28rpx;
diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue
index 22c8e3a..268bcb6 100644
--- a/pages/CardDetail/index.vue
+++ b/pages/CardDetail/index.vue
@@ -52,18 +52,14 @@
-
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -88,23 +84,32 @@
- 是否同意 《上门喂养次卡须知》
- 是否同意 《上门洗护次卡须知》
+ 是否同意 《上门喂养次卡须知》
+ 是否同意 《上门洗护次卡须知》
diff --git a/pages/UserCoupons/components/index.scss b/pages/UserCoupons/components/index.scss
index 3782aba..a050419 100644
--- a/pages/UserCoupons/components/index.scss
+++ b/pages/UserCoupons/components/index.scss
@@ -60,6 +60,8 @@
.coupons-left{
width:220rpx;
padding-top:10rpx;
+ //height:100%;
+ //align-items:center;
.coupons-big-title-group{
align-items: flex-end;
justify-content: center;
diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue
index afc01f5..59f24b9 100644
--- a/pages/UserCoupons/index.vue
+++ b/pages/UserCoupons/index.vue
@@ -15,14 +15,15 @@
backgroundImage:'url('+(item.status > 0?staticImage.couponsGrayBackground:staticImage.couponsBackground)+')'
}">
-
-
+
+
-
+
+
- 元
+ 元
-
+
{{item.cause}}
@@ -159,6 +160,18 @@
console.log(this.type)
this.navToUrl = option.url || ''
},
+ computed:{
+ couponsLeftStyle(){
+ let style = {};
+ if(this.couponType === 1){
+ style.height = '100%';
+ style.paddingTop = '0';
+ style.alignItems = 'center';
+ style.display = 'flex';
+ }
+ return style;
+ }
+ },
methods: {
cardCouponsConfirm(){
let checkedCoupons = this.couponsList.filter(item => {
diff --git a/uni_modules/uv-upload/components/uv-upload/uv-upload.vue b/uni_modules/uv-upload/components/uv-upload/uv-upload.vue
index 1ebf8c4..5d12923 100644
--- a/uni_modules/uv-upload/components/uv-upload/uv-upload.vue
+++ b/uni_modules/uv-upload/components/uv-upload/uv-upload.vue
@@ -16,6 +16,7 @@
+
+
+
@@ -91,6 +95,7 @@
import { chooseFile } from './utils';
import mixin_accept from './mixin.js';
import props from './props.js';
+ import {imghost} from "../../../../config/host";
/**
* upload 上传
* @description 该组件用于上传图片场景
@@ -139,6 +144,9 @@
lists: [],
controls:false,
isInCount: true,
+ staticImage:{
+ playButton:imghost +'/play-button.png'
+ },
}
},
watch: {