Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
# Conflicts: # .env
This commit is contained in:
zjf committed
commit
94a83aee42
7 files changed
+26
-34
No files matched your search
@@ -19,15 +19,15 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
|
||||
# --------------------------- 开发环境 api地址 ----------------------------------
|
||||
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上
|
||||
#VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
|
||||
; VITE_APP_DEV_SERVICE = http://192.168.101.125:9999 # 邓-本地
|
||||
VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
|
||||
VITE_APP_DEV_SERVICE = http://192.168.101.132:9999 # 邓-本地
|
||||
# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
|
||||
# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # 测试线上
|
||||
|
||||
# --------------------------- 开发环境 图片访问基础地址 ---------------------------
|
||||
# VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上
|
||||
#VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上
|
||||
; VITE_IMAGE_DEV_PATH = http://192.168.101.125:9999 # 邓-本地
|
||||
VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999
|
||||
VITE_IMAGE_DEV_PATH = http://192.168.101.132:9999 # 邓-本地
|
||||
# VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999
|
||||
# VITE_IMAGE_DEV_PATH = http://123.156.230.15:8089/api # 测试线上
|
||||
|
||||
# --------------------------- 生产环境 api地址 ----------------------------------
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
|
||||
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
|
||||
"version": "0.0",
|
||||
"configurations": [{
|
||||
"default" :
|
||||
{
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"mp-weixin" :
|
||||
{
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"type" : "uniCloud"
|
||||
}
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -160,7 +160,7 @@ export default {
|
||||
const userRole = uni.getStorageSync("userRole")
|
||||
const launchParam = getLaunchParam()
|
||||
if (launchParam == "thirdApp") {
|
||||
uni.navigateTo({ url: "/pages/thirdApp/thirdAppList" })
|
||||
uni.reLaunch({ url: "/pages/thirdApp/thirdAppList" })
|
||||
return
|
||||
}
|
||||
if (launchParam) {
|
||||
|
||||
+12
-12
@@ -1,29 +1,31 @@
|
||||
<template>
|
||||
<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
|
||||
<view class="w-full flex flex-wrap p-2">
|
||||
<view class="w-1/3 h-340rpx text-center p-1" v-for="(item, index) in state.cabinetList" :key="index">
|
||||
<view class="h-10rpx" />
|
||||
<view class="w-full flex flex-wrap">
|
||||
<view class="w-1/3 text-center p-1" v-for="(item, index) in state.cabinetList" :key="index">
|
||||
<view class="bg-transparent rounded-lg overflow-hidden">
|
||||
<image
|
||||
class="w-180rpx h-180rpx rounded-md object-cover"
|
||||
:src="item.spuDetail.pic"
|
||||
@click.stop="hooks.usePreviewImage(item.spuDetail.pic)"
|
||||
/>
|
||||
<view class="text-sm">{{ item.spuDetail.name }}</view>
|
||||
<view class="text-xs">{{ item.spuDetail.name }}</view>
|
||||
<view class="text-red-500 text-sm">¥{{ displayPrice(item.spuDetail.price) }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="h-300rpx" />
|
||||
<view class="open-door-btn-wrapper fixed bottom-40 left-0 right-0 flex justify-center items-center">
|
||||
<view class="ripple-container">
|
||||
<view class="ripple"></view>
|
||||
<view class="ripple"></view>
|
||||
<view class="ripple"></view>
|
||||
<view class="ripple" />
|
||||
<view class="ripple" />
|
||||
<view class="ripple" />
|
||||
</view>
|
||||
<view
|
||||
class="open-door-btn w-200rpx h-200rpx rounded-full bg-#0779FD77 overflow-hidden flex flex-col justify-center items-center shadow-lg"
|
||||
class="open-door-btn w-200rpx h-200rpx rounded-full bg-#0779FDdd overflow-hidden flex flex-col justify-center items-center shadow-lg"
|
||||
@click="goOpenDoor"
|
||||
>
|
||||
<image class="w-80rpx h-80rpx" src="@/static/page/开门.svg" />
|
||||
<image class="w-80rpx h-80rpx" src="@/static/page/开门-black.svg" />
|
||||
<text class="font-bold">开 门</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -95,7 +97,6 @@ const goOpenDoor = () => {
|
||||
.open-door-btn-wrapper {
|
||||
.open-door-btn {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
transition: transform 0.2s;
|
||||
|
||||
&:active {
|
||||
@@ -107,7 +108,6 @@ const goOpenDoor = () => {
|
||||
position: absolute;
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.ripple {
|
||||
@@ -115,8 +115,8 @@ const goOpenDoor = () => {
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
border-radius: 50%;
|
||||
border: 2px solid rgba(7, 121, 253);
|
||||
animation: ripple 1s linear infinite;
|
||||
border: 8px solid rgba(7, 121, 253);
|
||||
animation: ripple 2s linear infinite;
|
||||
opacity: 0;
|
||||
|
||||
&:nth-child(2) {
|
||||
|
||||
@@ -296,6 +296,7 @@ const scanCode = {
|
||||
if (isDevEnv()) {
|
||||
// 开发环境模拟扫码
|
||||
// const testQrCode = "eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=" // 线上-测试超市-收款二维码
|
||||
// const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxNDIxNTYwODQzNzQxMTg0MSIsImNhYmluZXRObyI6IjEifQ==" // 线上-智能柜-收款二维码
|
||||
// const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 邓本地-测试环境-新县府超市收款二维码
|
||||
// const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxMzE1NzA4MDQxODI5NTgwOSIsImNhYmluZXRObyI6IjEifQ==" // 邓本地-测试单门智能柜柜门二维码
|
||||
// const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?id=1905816751043452930&name=测试新县府超市" // 邓本地-测试环境-新县府超市收款二维码
|
||||
@@ -402,6 +403,11 @@ const doChangeRole = () => {
|
||||
// 初始化配置菜单
|
||||
const initMenuConfig = () => {
|
||||
if (isDevEnv()) {
|
||||
state.menuList.push({
|
||||
text: "测试-第三方应用",
|
||||
icon: "/static/icon/login.png",
|
||||
router: "/pages/thirdApp/thirdAppList",
|
||||
})
|
||||
state.menuList.push({
|
||||
text: "测试-登录",
|
||||
icon: "/static/icon/login.png",
|
||||
|
||||
@@ -111,7 +111,7 @@ const doFreeze = async () => {
|
||||
try {
|
||||
uni.showLoading({ title: "申请中...", mask: false })
|
||||
const _pa = {
|
||||
walletId: state.currentCard.id,
|
||||
walletTypeId: state.currentCard.walletTypeId,
|
||||
remark: freezeForm.remark,
|
||||
}
|
||||
const { data, code }: any = await walletApi.freeze(_pa)
|
||||
@@ -120,6 +120,7 @@ const doFreeze = async () => {
|
||||
pageRef.value.reload(true)
|
||||
uni.hideLoading()
|
||||
uni.showToast({ title: "申请成功", icon: "none" })
|
||||
freezeForm.remark = ""
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
uni.hideLoading()
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1748586636523" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2699" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M821.333333 48.64h-618.666666A74.666667 74.666667 0 0 0 128 123.306667V846.933333a74.666667 74.666667 0 0 0 65.706667 74.24l448 53.76h8.96a74.026667 74.026667 0 0 0 73.386666-62.72h97.28a74.666667 74.666667 0 0 0 74.666667-74.666666V123.306667a74.666667 74.666667 0 0 0-74.666667-74.666667zM661.333333 900.693333a10.666667 10.666667 0 0 1-11.946666 10.666667l-448-53.76a10.666667 10.666667 0 0 1-9.386667-10.666667V177.92A10.666667 10.666667 0 0 1 195.626667 170.666667a10.666667 10.666667 0 0 1 8.32-2.56l448 53.76a10.666667 10.666667 0 0 1 9.386666 10.666666z m170.666667-62.72a10.666667 10.666667 0 0 1-10.666667 10.666667H725.333333V231.68a74.666667 74.666667 0 0 0-65.706666-74.24l-374.613334-44.8H821.333333a10.666667 10.666667 0 0 1 10.666667 10.666667z" fill="#333333" p-id="2700"></path><path d="M565.333333 464.64a32 32 0 0 0-32 32v128a32 32 0 0 0 64 0v-128a32 32 0 0 0-32-32z" fill="#333333" p-id="2701"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
Reference in new issue
Block a user