zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

pull/2/head
tangqian 2023-05-23 17:21:37 +08:00
parent 3863a5a1d2 23c3f3bb90
commit 9a6e45053c
28 changed files with 9494 additions and 10081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builds/Dockerfile-pro Normal file
View File

@ -0,0 +1,20 @@
FROM registry.cn-hangzhou.aliyuncs.com/lrh-public/openjdk:8u222-jre-up
LABEL Author="axzsd" \
Email="atva725@qq.com" \
Description="创盈支付服务端"
ENV SPRING_PROFILES_ACTIVE="prod"
ENV JAVA_OPTIONS "-Xms4000m -Xmx4096m \
-XX:+HeapDumpOnOutOfMemoryError \
-Dfile.encoding=UTF-8 \
-Djava.awt.headless=true \
-Dsun.net.client.defaultConnectTimeout=10000 \
-Dsun.net.client.defaultReadTimeout=30000"
WORKDIR /work/projects/yudao-server
COPY yudao-server/target/yudao-server.jar /opt/app.jar
EXPOSE 48080
ENTRYPOINT exec java $JAVA_OPTIONS -jar -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} /opt/app.jar

28
builds/docker-compose-prod.yml Normal file
View File

@ -0,0 +1,28 @@
version: "3.9"
services:
yudao-server:
image: ${IMAGE_VERSION}
restart: always
privileged: true
container_name: yudao-server
environment:
TZ: Asia/Shanghai
SPRING_PROFILES_ACTIVE: prod
# volumes:
# - /opt/logs/cyywl:/work/projects/yudao-server
ulimits:
nproc: 65535
nofile:
soft: 20000
hard: 40000
ports:
- "48080:48080"
deploy:
resources:
limits:
memory: 4096MB
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
timeout: 30s
interval: 45s
retries: 3

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java
View File

@ -106,6 +106,8 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
if(this.cityIdList == null || this.cityIdList.size() < 1){ if(this.cityIdList == null || this.cityIdList.size() < 1){
Area area = AreaUtils.getArea(Area.ID_CHINA); Area area = AreaUtils.getArea(Area.ID_CHINA);
Assert.notNull(area, "获取不到中国"); Assert.notNull(area, "获取不到中国");
cityIdList = new ArrayList<>();
AreaUtils.getAreaId(cityIdList, AreaTypeEnum.DISTRICT,area.getChildren()); AreaUtils.getAreaId(cityIdList, AreaTypeEnum.DISTRICT,area.getChildren());
} }
return this.cityIdList; return this.cityIdList;

1
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -33,6 +33,7 @@
left join system_dept d on d.id = a.dept_id left join system_dept d on d.id = a.dept_id
<include refid="baseWhere"> <include refid="baseWhere">
</include> </include>
order by a.pay_time desc
</select> </select>
<select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO"> <select id="findListPage" resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
select select

4
yudao-server/src/main/resources/application-prod.yaml
View File

@ -176,8 +176,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
private-key-path: classpath:/1/apiclient_key.pem private-key-path: classpath:/1/apiclient_key.pem
key-path: classpath:/1/apiclient_cert.p12 key-path: classpath:/1/apiclient_cert.p12
cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD
notify-url: http://api.cyywl.top/app-api/pay/wxpay/pay_notify notify-url: http://api.cyywl.top/admin-api/notify/wxpay/pay_notify
refund-notify-url: http://api.cyywl.top/app-api/pay/wxpay/refund_notify refund-notify-url: http://api.cyywl.top/admin-api/notify/wxpay/refund_notify
two: two:
enabled: true enabled: true
app-id: wxb1826c88da21d81e app-id: wxb1826c88da21d81e

4
yudao-ui-admin/.env.dev
View File

@ -5,8 +5,8 @@ ENV = 'development'
VUE_APP_TITLE = 创盈商户管理系统 VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api' #VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
#VUE_APP_BASE_API = 'http://192.168.1.147:48080' VUE_APP_BASE_API = 'http://192.168.1.188:48080'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

17330
yudao-ui-admin/yarn.lock
View File

File diff suppressed because it is too large Load Diff

6
yudao-ui-app/api/member.js
View File

@ -15,6 +15,12 @@ export function memberOrderInfo(){
return request.get('api/order/member/memberOrderInfo', {}) return request.get('api/order/member/memberOrderInfo', {})
} }
/**
* 根据手机号查询档次信息
*/
export function memberByHomeGradeInfo(phone){
return request.get(`api/order/member/memberByHomeGradeInfo?phone=${phone}`, {})
}
/** /**
* 会员头部信息 * 会员头部信息
*/ */

6
yudao-ui-app/api/store.js
View File

@ -70,7 +70,7 @@ export function postCartAdd(data) {
* *
*/ */
export function getCategoryList() { export function getCategoryList() {
return request.get('category', {}, { return request.get('front/category', {}, {
noAuth: true noAuth: true
}); });
} }
@ -80,7 +80,7 @@ export function getCategoryList() {
* @param object data * @param object data
*/ */
export function getProductslist(data) { export function getProductslist(data) {
return request.get('products', data, { return request.get('front/products', data, {
noAuth: true noAuth: true
}); });
} }
@ -90,7 +90,7 @@ export function getProductslist(data) {
* *
*/ */
export function getProductHot(page, limit) { export function getProductHot(page, limit) {
return request.get("product/hot", { return request.get("front/product/hot", {
page: page === undefined ? 1 : page, page: page === undefined ? 1 : page,
limit: limit === undefined ? 4 : limit limit: limit === undefined ? 4 : limit
}, { }, {

6
yudao-ui-app/components/countDown/index.vue
View File

@ -3,8 +3,10 @@
<text class="red" v-if="tipText">{{ tipText }}</text> <text class="red" v-if="tipText">{{ tipText }}</text>
<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'" v-if="isDay === true">{{ day }}</text> <text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'" v-if="isDay === true">{{ day }}</text>
<text class="timeTxt red" v-if="dayText">{{ dayText }}</text> <text class="timeTxt red" v-if="dayText">{{ dayText }}</text>
<template v-if="isShowHour">
<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ hour }}</text> <text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ hour }}</text>
<text class="timeTxt red" v-if="hourText">{{ hourText }}</text> <text class="timeTxt red" v-if="hourText">{{ hourText }}</text>
</template>
<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ minute }}</text> <text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ minute }}</text>
<text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text> <text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text>
<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ second }}</text> <text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ second }}</text>
@ -49,6 +51,10 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
isShowHour: {
type: Boolean,
default: true
},
bgColor:{ bgColor:{
type: String, type: String,
default: "" default: ""

24
yudao-ui-app/components/paymentMember/index.vue
View File

@ -20,9 +20,11 @@
</view> </view>
</view> </view>
<view class="mask" @click='close' v-if="pay_close"></view> <view class="mask" @click='close' v-if="pay_close"></view>
<button style="cursor: pointer;display:none;" class="clipboard"
:data-clipboard-text="alipayLink">
</button>
<!-- 支付宝支付界面 --> <!-- 支付宝支付界面 -->
<u-modal :show="alipayShow" title="支付宝支付" @confirm="handleConfirm"> <u-modal :show="alipayShow" title="支付宝支付" @confirm="handleConfirm">
<button style="display:none;" class="btn" data-clipboard-text="Just because you can doesn't mean you should — clipboard.js"></button>
<view class="slot-content"> <view class="slot-content">
<rich-text :nodes="alipayForm"></rich-text> <rich-text :nodes="alipayForm"></rich-text>
</view> </view>
@ -42,6 +44,7 @@
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
import Clipboard from 'clipboard'
export default { export default {
props: { props: {
payMode: { payMode: {
@ -66,10 +69,14 @@
data() { data() {
return { return {
alipayShow: false, alipayShow: false,
alipayForm: `链接已复制，请到外部浏览器完成支付` alipayForm: `链接已复制，请到外部浏览器完成支付`,
alipayLink: ''
}; };
}, },
computed: mapGetters(['systemPlatform', 'openId']), computed: mapGetters(['systemPlatform', 'openId']),
mounted() {
new Clipboard('.clipboard')
},
methods: { methods: {
handleConfirm() { handleConfirm() {
this.alipayShow = false this.alipayShow = false
@ -140,12 +147,13 @@
title: '支付中', title: '支付中',
mask: true mask: true
}); });
if (paytype === 'WXPAY' && !that.openId) { if(paytype === 'WXPAY' && that.openId) {
that.payInfo.openid = that.openId
} else if(paytype === 'WXPAY' && !that.openId){
return that.$util.Tips({ return that.$util.Tips({
title: '请在微信客户端进行支付操作' title: '请在微信客户端进行支付操作'
}); });
} else {
that.payInfo.openid = that.openId
} }
memberTopUp({ memberTopUp({
...that.payInfo, ...that.payInfo,
@ -159,8 +167,12 @@
break; break;
case 'ALIPAY': case 'ALIPAY':
uni.hideLoading(); uni.hideLoading();
this._copy(jsConfig.body) this.alipayLink = jsConfig.body
// this._copy(jsConfig.body)
setTimeout(()=>{
document.querySelector(".clipboard").click();
this.alipayShow = true this.alipayShow = true
}, 500)
// const div = document.createElement('div') // const div = document.createElement('div')
// /* 下面的data.content就是后台返回接收到的数据 */ // /* 下面的data.content就是后台返回接收到的数据 */
// div.innerHTML = jsConfig.body // div.innerHTML = jsConfig.body

6
yudao-ui-app/config/app.js
View File

@ -1,12 +1,14 @@
let domain = 'http://api.cyywl.top' // let domain = 'http://yuxy.perrymake.com'
let domain = 'http://192.168.1.188:48080'
module.exports = { module.exports = {
// 请求域名 格式： https://您的域名 // 请求域名 格式： https://您的域名
// #ifdef MP // #ifdef MP
HTTP_REQUEST_URL: domain, HTTP_REQUEST_URL: domain,
// #endif // #endif
HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址，上传图片用 // HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址，上传图片用
HTTP_ADMIN_URL:'http://192.168.1.188:48080', //PC后台的API请求地址，上传图片用
// #ifdef H5 // #ifdef H5
//H5接口是浏览器地址 //H5接口是浏览器地址
// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,

501
yudao-ui-app/package-lock.json generated
View File

@ -1,447 +1,84 @@
{ {
"name": "yudao-ui-app",
"version": "1.0.0",
"lockfileVersion": 2,
"requires": true, "requires": true,
"lockfileVersion": 1, "packages": {
"": {
"name": "yudao-ui-app",
"version": "1.0.0",
"license": "ISC",
"dependencies": { "dependencies": {
"ansi-regex": { "clipboard": "^2.0.11"
"version": "2.1.1", }
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
}, },
"ansi-styles": { "node_modules/clipboard": {
"version": "2.2.1", "version": "2.0.11",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
"dependencies": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
}, },
"babel-code-frame": { "node_modules/delegate": {
"version": "6.26.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"node_modules/good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
"dependencies": {
"delegate": "^3.1.2"
}
},
"node_modules/select": {
"version": "1.1.2",
"resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
},
"node_modules/tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
}
},
"dependencies": {
"clipboard": {
"version": "2.0.11",
"resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
"requires": { "requires": {
"chalk": "^1.1.3", "good-listener": "^1.2.2",
"esutils": "^2.0.2", "select": "^1.1.2",
"js-tokens": "^3.0.2" "tiny-emitter": "^2.0.0"
} }
}, },
"babel-core": { "delegate": {
"version": "6.26.3", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
"requires": { "requires": {
"babel-code-frame": "^6.26.0", "delegate": "^3.1.2"
"babel-generator": "^6.26.0",
"babel-helpers": "^6.24.1",
"babel-messages": "^6.23.0",
"babel-register": "^6.26.0",
"babel-runtime": "^6.26.0",
"babel-template": "^6.26.0",
"babel-traverse": "^6.26.0",
"babel-types": "^6.26.0",
"babylon": "^6.18.0",
"convert-source-map": "^1.5.1",
"debug": "^2.6.9",
"json5": "^0.5.1",
"lodash": "^4.17.4",
"minimatch": "^3.0.4",
"path-is-absolute": "^1.0.1",
"private": "^0.1.8",
"slash": "^1.0.0",
"source-map": "^0.5.7"
} }
}, },
"babel-generator": { "select": {
"version": "6.26.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
"integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
"requires": {
"babel-messages": "^6.23.0",
"babel-runtime": "^6.26.0",
"babel-types": "^6.26.0",
"detect-indent": "^4.0.0",
"jsesc": "^1.3.0",
"lodash": "^4.17.4",
"source-map": "^0.5.7",
"trim-right": "^1.0.1"
}
}, },
"babel-helpers": { "tiny-emitter": {
"version": "6.24.1", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
"requires": {
"babel-runtime": "^6.22.0",
"babel-template": "^6.24.1"
}
},
"babel-messages": {
"version": "6.23.0",
"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
"requires": {
"babel-runtime": "^6.22.0"
}
},
"babel-register": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"requires": {
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
"core-js": "^2.5.0",
"home-or-tmp": "^2.0.0",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
"source-map-support": "^0.4.15"
}
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
}
},
"babel-template": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
"requires": {
"babel-runtime": "^6.26.0",
"babel-traverse": "^6.26.0",
"babel-types": "^6.26.0",
"babylon": "^6.18.0",
"lodash": "^4.17.4"
}
},
"babel-traverse": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
"requires": {
"babel-code-frame": "^6.26.0",
"babel-messages": "^6.23.0",
"babel-runtime": "^6.26.0",
"babel-types": "^6.26.0",
"babylon": "^6.18.0",
"debug": "^2.6.8",
"globals": "^9.18.0",
"invariant": "^2.2.2",
"lodash": "^4.17.4"
}
},
"babel-types": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"requires": {
"babel-runtime": "^6.26.0",
"esutils": "^2.0.2",
"lodash": "^4.17.4",
"to-fast-properties": "^1.0.3"
}
},
"babylon": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"convert-source-map": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
"requires": {
"safe-buffer": "~5.1.1"
}
},
"core-image-xhr": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-image-xhr/-/core-image-xhr-1.0.3.tgz",
"integrity": "sha1-khHXtcQSGa9atpuThMoqR9VytHY="
},
"core-js": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
"integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
},
"daycaca": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/daycaca/-/daycaca-1.0.11.tgz",
"integrity": "sha512-2SJTpnpmxUGVWbFPTRhaZLvisCD7bYjvuFpLAhjfAAvtnBb26dAqIqaZ9Jq8yvSlugpEGY+v/YXHXGP3paVV9A=="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
},
"detect-indent": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
"requires": {
"repeating": "^2.0.0"
}
},
"dom7": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
"requires": {
"ssr-window": "^1.0.1"
}
},
"emoji-awesome": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/emoji-awesome/-/emoji-awesome-0.0.2.tgz",
"integrity": "sha512-ggortYTr4+f4Jqp/R3vV9FAec+wRkIyRM458LUrv81mKQSKIJW9+xDlbqHsUpMeNKCLG45RsbbCyprrOoGZ6UQ=="
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"esutils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
},
"globals": {
"version": "9.18.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
},
"has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"home-or-tmp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.1"
}
},
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"requires": {
"loose-envify": "^1.0.0"
}
},
"is-finite": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
},
"jsesc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
},
"json5": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
},
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
"loose-envify": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
"mkdirp": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
"requires": {
"minimist": "^1.2.5"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"private": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
},
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
},
"repeating": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"requires": {
"is-finite": "^1.0.0"
}
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"slash": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
},
"source-map-support": {
"version": "0.4.18",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
"requires": {
"source-map": "^0.5.6"
}
},
"ssr-window": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
},
"swiper": {
"version": "5.3.8",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-5.3.8.tgz",
"integrity": "sha512-bCxrayTgzC2bZBRuFwAx7T4exWeHqMADBpcuTQ7PNCOIIzJRPqNh4ySIvW06LEEU3Q0KncaNre4hrn+jXcWivQ==",
"requires": {
"dom7": "^2.1.3",
"ssr-window": "^1.0.1"
}
},
"to-fast-properties": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
},
"trim-right": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
},
"vue": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
"vue-awesome-swiper": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz",
"integrity": "sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ=="
},
"vue-core-image-upload": {
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/vue-core-image-upload/-/vue-core-image-upload-2.4.11.tgz",
"integrity": "sha512-He0OcNqUaL2yHQebFwk4IxLr1Q8m1S7u8zTUek7pMaOUHW76MXOOn6sHoJMruURNvsv3SyeqFEt4N7JQBnMviA==",
"requires": {
"babel-core": "^6.26.0",
"core-image-xhr": "^1.0.3",
"daycaca": "^1.0.6",
"vue": "^2.5.13"
}
} }
} }
} }

15
yudao-ui-app/package.json Normal file
View File

@ -0,0 +1,15 @@
{
"name": "yudao-ui-app",
"version": "1.0.0",
"description": "",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"clipboard": "^2.0.11"
}
}

40
yudao-ui-app/pages.json
View File

@ -574,34 +574,34 @@
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [ "list": [
// { {
// "pagePath": "pages/index/index", "pagePath": "pages/index/index",
// "iconPath": "static/images/tabbar/nav_icon_shop.png", "iconPath": "static/images/tabbar/nav_icon_shop.png",
// "selectedIconPath": "static/images/1-002.png", "selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
// "text": "商城" "text": "商城"
// }, },
// { {
// "pagePath": "pages/goods_cate/goods_cate", "pagePath": "pages/goods_cate/goods_cate",
// "iconPath": "static/images/tabbar/nav_icon_sort.png", "iconPath": "static/images/tabbar/nav_icon_sort.png",
// "selectedIconPath": "static/images/2-002.png", "selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
// "text": "分类" "text": "分类"
// }, },
{ {
"pagePath": "pages/member_application/index", "pagePath": "pages/member_application/index",
"iconPath": "static/images/2-001.png", "iconPath": "static/images/tabbar/nav_icon_member.png",
"selectedIconPath": "static/images/tabbar/nav_icon_member_active.png", "selectedIconPath": "static/images/tabbar/nav_icon_member_active.png",
"text": "会员申请" "text": "会员申请"
}, },
// { {
// "pagePath": "pages/order_addcart/order_addcart", "pagePath": "pages/order_addcart/order_addcart",
// "iconPath": "static/images/tabbar/nav_icon_cart.png", "iconPath": "static/images/tabbar/nav_icon_cart.png",
// "selectedIconPath": "static/images/3-002.png", "selectedIconPath": "static/images/tabbar/nav_icon_cart_active.png",
// "text": "购物车" "text": "购物车"
// }, },
{ {
"pagePath": "pages/user/index", "pagePath": "pages/user/index",
"iconPath": "static/images/tabbar/nav_icon_my.png", "iconPath": "static/images/tabbar/nav_icon_my.png",
"selectedIconPath": "static/images/4-002.png", "selectedIconPath": "static/images/tabbar/nav_icon_my_active.png",
"text": "我的" "text": "我的"
} }
] ]

135
yudao-ui-app/pages/goods_cashier/index.vue
View File

@ -1,13 +1,14 @@
<template> <template>
<view class="page" v-if="payPriceShow"> <view class="page" v-if="payPriceShow">
<view class="pay-price"> <view class="pay-price">
<view class="title">实付金额</view>
<view class="price"> <view class="price">
<text class="unit">￥</text> <text class="unit">￥</text>
<numberScroll :num='payPriceShow' color="#E93323" width='30' height='50' fontSize='50'></numberScroll> <numberScroll :num='payPriceShow' color="#F12A65" width='30' height='50' fontSize='50'></numberScroll>
</view> </view>
<view class="count-down"> <view class="count-down">
支付剩余时间： 支付剩余时间
<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" <countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''" :minute-text="' : '"
:second-text="' '" :datatime="invalidTime"></countDown> :second-text="' '" :datatime="invalidTime"></countDown>
</view> </view>
</view> </view>
@ -24,17 +25,33 @@
<view class="info" v-if="item.value == 'yue'"> <view class="info" v-if="item.value == 'yue'">
{{item.title}} <span class="money">￥{{ item.number }}</span> {{item.title}} <span class="money">￥{{ item.number }}</span>
</view> </view>
<view class="info" v-else>{{item.title}}</view> <!-- <view class="info" v-else>{{item.title}}</view> -->
</view> </view>
</view> </view>
<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view> <view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
</view> </view>
</view> </view>
<view class="btn"> <view class="btn">
<view class="button acea-row row-center-wrapper" @click='goPay(number, paytype)'>确认支付</view> <view class="button acea-row row-center-wrapper pay-button" @click='goPay(number, paytype)'>确认支付</view>
<view class="wait-pay" @click="waitPay">暂不支付</view> <view class="wait-pay" @click="waitPay">暂不支付</view>
</view> </view>
<view v-show="false" v-html="formContent"></view> <view v-show="false" v-html="formContent"></view>
<u-modal :show="cancelPayModalShow" width="519rpx">
<view class="modal-wrap">
<view class="count-down">
支付剩余时间
<countDown :is-day="false" :is-show-hour='false' :tip-text="''" :day-text="''" :hour-text="''" :minute-text="' : '"
:second-text="' '" :datatime="invalidTime"></countDown>
</view>
<view class="model-content">确认要放弃付款吗？</view>
</view>
<view slot="confirmButton">
<view class="modal-btn-wrap">
<u-button class="give-up-btn" @click="onGiveUpPay">放弃</u-button>
<u-button class="continue-btn">继续支付</u-button>
</view>
</view>
</u-modal>
</view> </view>
</view> </view>
</template> </template>
@ -53,8 +70,8 @@
}, },
data() { data() {
return { return {
cancelPayModalShow: false,
checked: false, checked: false,
datatime: 1676344056,
//支付方式 //支付方式
cartArr: [{ cartArr: [{
"name": '微信支付', "name": '微信支付',
@ -74,11 +91,11 @@
orderId: 0, orderId: 0,
fromType: '', fromType: '',
active: 0, active: 0,
payPrice: 10, payPrice: 10.00,
payPriceShow: 10, payPriceShow: 10.00,
payPostage: 0, payPostage: 0,
offlinePostage: false, offlinePostage: false,
invalidTime: 1684748596, invalidTime: 1684836534,
initIn: false, initIn: false,
jumpData: { jumpData: {
orderId: '', orderId: '',
@ -152,6 +169,10 @@
} }
}, },
methods: { methods: {
onGiveUpPay() {
this.cancelPayModalShow = false
// uni.navigateBack()
},
getCashierOrder() { getCashierOrder() {
uni.showLoading({ uni.showLoading({
title: '创建订单中' title: '创建订单中'
@ -219,10 +240,11 @@
}) })
}, },
waitPay() { waitPay() {
uni.reLaunch({ this.cancelPayModalShow = true
url: '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=取消支付&type=3' + // uni.reLaunch({
'&status=2&totalPrice=' + this.payPriceShow // url: '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=取消支付&type=3' +
}) // '&status=2&totalPrice=' + this.payPriceShow
// })
}, },
goPay(number, paytype) { goPay(number, paytype) {
let that = this; let that = this;
@ -572,24 +594,74 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page { .page {
.count-down .time {
margin-left: 10rpx;
}
.modal-btn-wrap {
display: flex;
justify-content: space-between;
.give-up-btn,
.continue-btn {
flex: 1;
height: 71rpx;
line-height: 71rpx;
background: #F3F3F3;
border: 1px solid #BFBFBF;
border-radius: 35rpx;
text-align: center
}
.continue-btn {
margin-left: 47rpx;
border: none;
color: #fff;
background: linear-gradient(0deg, #E83769 0%, #FE7E9D 100%);
}
}
.modal-wrap {
width: 100%;
text-align: center;
.count-down{
display: flex;
justify-content: center;
font-size: 32rpx;
color: #F4356B;
margin-bottom: 42rpx;
margin-top: 57rpx;
}
.model-content {
font-size: 30rpx;
color: #000;
}
}
.pay-price { .pay-price {
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 50rpx 0 40rpx 0; padding: 88rpx 0 56rpx 0;
.title {
font-size: 28rpx;
color: #000;
margin-bottom: 34rpx;
}
.price { .price {
color: #E93323; color: #F12A65;
margin-bottom: 20rpx; margin-bottom: 29rpx;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
.unit { .unit {
font-size: 34rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 41rpx; line-height: 41rpx;
} }
@ -603,11 +675,8 @@
.count-down { .count-down {
display: flex; display: flex;
align-items: center; align-items: center;
background-color: #fff; font-size: 28rpx;
padding: 8rpx 28rpx; color: #7A7A7A;
border-radius: 40rpx;
font-size: 24rpx;
color: #E93323;
.time { .time {
margin-top: 0 !important; margin-top: 0 !important;
@ -627,9 +696,10 @@
margin: 0 30rpx; margin: 0 30rpx;
.title { .title {
color: #666666; color: #000;
font-size: 26rpx; font-size: 32rpx;
padding: 30rpx 0 0 30rpx; font-weight: 400;
padding: 30rpx 0 25rpx 30rpx;
} }
.payMoney { .payMoney {
@ -659,8 +729,7 @@
} }
.payment .item { .payment .item {
border-bottom: 1rpx solid #eee; height: 80rpx;
height: 130rpx;
margin-left: 30rpx; margin-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;
} }
@ -724,13 +793,21 @@
.btn { .btn {
position: fixed; position: fixed;
left: 30rpx; left: 50rpx;
right: 50rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
bottom: 30rpx; bottom: 30rpx;
bottom: calc(30rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ bottom: calc(30rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
.pay-button {
width: 100%;
height: 87rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);
border-radius: 44px;
}
} }
.wait-pay { .wait-pay {

3
yudao-ui-app/pages/member_application/index.vue
View File

@ -107,8 +107,7 @@
}); });
try{ try{
const res = await memberGradeInfo() const res = await memberGradeInfo()
if(res.data.some((item) => !!!parseInt(item.isExist))){ if(res.data.some((item) => !!parseInt(item.isExist))){
console.log(123123)
uni.setTabBarItem({ uni.setTabBarItem({
index: 0, index: 0,
pagePath: '/pages/member_equity/index' pagePath: '/pages/member_equity/index'

14
yudao-ui-app/pages/member_equity/index.vue
View File

@ -17,7 +17,10 @@
</view> </view>
<view class="box-equity"> <view class="box-equity">
<view class="equity-text"> <view class="equity-text">
<view >
<image src='../../static/images/memberLogo.png'></image>
<text class="equity-member">我的会员权益</text> <text class="equity-member">我的会员权益</text>
</view>
<text class="equity-look">查看权益></text> <text class="equity-look">查看权益></text>
</view> </view>
<view class="equity-item" v-for="(item,index) in 3" :key="index"> <view class="equity-item" v-for="(item,index) in 3" :key="index">
@ -213,7 +216,16 @@
display: flex; display: flex;
align-items: center; align-items: center;
height: 10%; height: 10%;
view{
display: flex;
align-items: center;
justify-content: center;
width: 44%;
image{
width: 26rpx;
height: 26rpx;
}
}
.equity-member { .equity-member {
margin: 0 10%; margin: 0 10%;
font-size: 30rpx; font-size: 30rpx;

20
yudao-ui-app/pages/member_others/index.vue
View File

@ -43,7 +43,8 @@
<script> <script>
import { import {
memberGradeInfo memberGradeInfo,
memberByHomeGradeInfo
} from '@/api/member.js'; } from '@/api/member.js';
import paymentMember from '@/components/paymentMember'; import paymentMember from '@/components/paymentMember';
import store from '@/store/index'; import store from '@/store/index';
@ -125,6 +126,23 @@
uni.hideLoading(); uni.hideLoading();
} }
}, },
watch:{
'form.confirmPhone' (){
this.$refs.uForm.validate().then(async res => {
uni.showLoading({
title: '加载中',
mask: true
});
try{
const res = await memberByHomeGradeInfo(this.form.confirmPhone)
this.memberData = res.data
} finally{
uni.hideLoading();
}
})
}
},
methods: { methods: {
handleMember(value, index) { handleMember(value, index) {
if (!!parseInt(value.isExist)) return if (!!parseInt(value.isExist)) return

20
yudao-ui-app/pages/users/user_spread_code/index.vue
View File

@ -86,16 +86,16 @@
}; };
}, },
computed: mapGetters(['isLogin', 'uid', 'userInfo','tenantId']), computed: mapGetters(['isLogin', 'uid', 'userInfo','tenantId']),
watch: { // watch: {
isLogin: { // isLogin: {
handler: function(newV, oldV) { // handler: function(newV, oldV) {
if (newV) { // if (newV) {
this.userSpreadBannerList(); // this.userSpreadBannerList();
} // }
}, // },
deep: true // deep: true
} // }
}, // },
onLoad() { onLoad() {
if (this.isLogin) { if (this.isLogin) {
this.userSpreadBannerList(); this.userSpreadBannerList();

BIN
yudao-ui-app/static/images/tabbar/nav_icon_cart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_cart_active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_member.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_member_active.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_my_active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_shop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_shop_active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
yudao-ui-app/static/images/tabbar/nav_icon_sort_active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB