init
This commit is contained in:
@@ -1,36 +1,20 @@
|
|||||||
# 版本号
|
# 版本号
|
||||||
SHOPRO_VERSION=v2.4.1
|
SHOPRO_VERSION=v2.4.1
|
||||||
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
|
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
|
||||||
SHOPRO_BASE_URL=https://yougou.api.qflyqzy.net
|
SHOPRO_BASE_URL=https://kyj.api.suwizihe.org.cn
|
||||||
# SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
|
|
||||||
|
|
||||||
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
|
|
||||||
|
|
||||||
# 霍慧超
|
|
||||||
#SHOPRO_DEV_BASE_URL=http://192.168.101.7:48092
|
|
||||||
|
|
||||||
# 陈力
|
|
||||||
# SHOPRO_DEV_BASE_URL=http://192.168.101.57:48092
|
|
||||||
|
|
||||||
# 张吉生
|
|
||||||
#SHOPRO_DEV_BASE_URL=http://192.168.101.58:48090
|
|
||||||
|
|
||||||
# 服务器
|
# 服务器
|
||||||
# SHOPRO_DEV_BASE_URL=https://yougou.api.qflyqzy.net
|
SHOPRO_DEV_BASE_URL=https://kyj.api.suwizihe.org.cn
|
||||||
|
|
||||||
# SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api
|
|
||||||
|
|
||||||
# 伟伟
|
# 伟伟
|
||||||
# SHOPRO_DEV_BASE_URL=http://192.168.1.7:48080
|
# SHOPRO_DEV_BASE_URL=http://192.168.1.7:48080
|
||||||
|
|
||||||
# 测试环境
|
# 测试环境
|
||||||
SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com
|
# SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com
|
||||||
|
|
||||||
# 本地
|
# 本地
|
||||||
# SHOPRO_DEV_BASE_URL=http://192.168.1.3:48080
|
# SHOPRO_DEV_BASE_URL=http://192.168.1.3:48080
|
||||||
|
|
||||||
### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48090
|
|
||||||
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
|
|
||||||
|
|
||||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
|
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
|
||||||
SHOPRO_UPLOAD_TYPE=server
|
SHOPRO_UPLOAD_TYPE=server
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
- 更改版本号
|
- 更改版本号
|
||||||
- 当前版本号`1.4.1`
|
- 当前版本号`1.4.1`
|
||||||
- 包名:`uni.UNI8B187414/com.yougou.mall`
|
- 包名:`uni.UNI8B187414/com.yougou.mall`
|
||||||
- 应用名称:`优购商城`
|
- 应用名称:`康源家园`
|
||||||
- appId:`__UNI__8B19741`
|
- appId:`__UNI__8B19741`
|
||||||
- api地址`.env`:
|
- api地址`.env`:
|
||||||
- 线上`https://www.qflyqzy.net/yg-api`
|
- 线上`https://www.qflyqzy.net/yg-api`
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="tabbar-wrap">
|
<view class="tabbar-wrap">
|
||||||
<view class="tabbar safe-bottom">
|
<view class="tabbar safe-bottom">
|
||||||
<image class="tabbar-bg" :src="bgSrc" mode="scaleToFill" />
|
<!-- :src="bgSrc" -->
|
||||||
|
<image class="tabbar-bg" mode="scaleToFill" />
|
||||||
<view class="tabbar-inner">
|
<view class="tabbar-inner">
|
||||||
<view
|
<view
|
||||||
v-for="item in items"
|
v-for="item in items"
|
||||||
@@ -92,19 +93,19 @@
|
|||||||
iconPath: '/static/index/2.png',
|
iconPath: '/static/index/2.png',
|
||||||
selectedIconPath: '/static/index/blue_icon/2_1.png',
|
selectedIconPath: '/static/index/blue_icon/2_1.png',
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
pagePath: '/pages/home/seed',
|
// pagePath: '/pages/home/seed',
|
||||||
text: '',
|
// text: '',
|
||||||
iconPath: '/static/index/jinzhongzi.png',
|
// iconPath: '/static/index/jinzhongzi.png',
|
||||||
selectedIconPath: '/static/index/jinzhongzi.png',
|
// selectedIconPath: '/static/index/jinzhongzi.png',
|
||||||
isMid: true,
|
// isMid: true,
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
pagePath: '/pages/cart/cart',
|
// pagePath: '/pages/cart/cart',
|
||||||
text: '购物车',
|
// text: '购物车',
|
||||||
iconPath: '/static/index/3.png',
|
// iconPath: '/static/index/3.png',
|
||||||
selectedIconPath: '/static/index/blue_icon/3_1.png',
|
// selectedIconPath: '/static/index/blue_icon/3_1.png',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
pagePath: '/pages/index/user',
|
pagePath: '/pages/index/user',
|
||||||
text: '我的',
|
text: '我的',
|
||||||
@@ -212,6 +213,7 @@
|
|||||||
bottom: env(safe-area-inset-bottom);
|
bottom: env(safe-area-inset-bottom);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
|
background: #ffffff;
|
||||||
filter: drop-shadow(0 -6rpx 24rpx rgba(0, 0, 0, 0.12));
|
filter: drop-shadow(0 -6rpx 24rpx rgba(0, 0, 0, 0.12));
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport"
|
<meta name="viewport"
|
||||||
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
|
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
|
||||||
<title>优购商城</title>
|
<title>康源家园</title>
|
||||||
<!--preload-links-->
|
<!--preload-links-->
|
||||||
<!--app-context-->
|
<!--app-context-->
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name" : "优购商城",
|
"name" : "康源家园",
|
||||||
"appid" : "__UNI__8B19741",
|
"appid" : "__UNI__8B19741",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.7.6",
|
"versionName" : "1.0.0",
|
||||||
"versionCode" : 176,
|
"versionCode" : 100,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"privacy" : {
|
"privacy" : {
|
||||||
|
|||||||
+1
-1
@@ -161,7 +161,7 @@
|
|||||||
<radio color="#FB4D32" class="radio" value="1" :checked="radioValue" />
|
<radio color="#FB4D32" class="radio" value="1" :checked="radioValue" />
|
||||||
<view class="flex-center size24">
|
<view class="flex-center size24">
|
||||||
我已阅读并同意
|
我已阅读并同意
|
||||||
<text class="c8" @click="go()">《臻选优购服务协议》</text>
|
<text class="c8" @click="go()">《臻选康源家服务协议》</text>
|
||||||
</view>
|
</view>
|
||||||
</label>
|
</label>
|
||||||
</radio-group>
|
</radio-group>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<s-pages title="提现" :pink_bg="true">
|
<s-pages title="提现" :pink_bg="true">
|
||||||
<view class="pages p-y-28 p-x-40 c0">
|
<view class="pages p-y-28 p-x-40 c0">
|
||||||
<!-- <view class="m-b-20 tab-header">
|
<!-- <view class="m-b-20 tab-header">
|
||||||
<text class="tab-item" :class="{ active: type === 'yougou' }" @click="changeType('yougou')">优购提现</text>
|
<text class="tab-item" :class="{ active: type === 'yougou' }" @click="changeType('yougou')">康源家提现</text>
|
||||||
<text class="tab-item m-l-20" :class="{ active: type === 'huamao' }"
|
<text class="tab-item m-l-20" :class="{ active: type === 'huamao' }"
|
||||||
@click="changeType('huamao')">华贸提现</text>
|
@click="changeType('huamao')">华贸提现</text>
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|||||||
@@ -84,10 +84,10 @@
|
|||||||
<text class="record-item__meta-value">{{ formatDateTime(v.createTime) }}</text>
|
<text class="record-item__meta-value">{{ formatDateTime(v.createTime) }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="v.approveTime" class="record-item__meta-row">
|
<view v-if="v.approveTime" class="record-item__meta-row">
|
||||||
<text class="record-item__meta-label">审核时间:</text>
|
<text class="record-item__meta-label">{{ Number(v.status) === 3 ? '撤单时间:' : '审核时间:' }}</text>
|
||||||
<text class="record-item__meta-value">{{ formatDateTime(v.approveTime) }}</text>
|
<text class="record-item__meta-value">{{ formatDateTime(v.approveTime) }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="v.approveRemark" class="record-item__remark-row">
|
<view v-if="v.approveRemark && Number(v.status) !== 3" class="record-item__remark-row">
|
||||||
<text class="record-item__remark-label">备注:</text>
|
<text class="record-item__remark-label">备注:</text>
|
||||||
<text class="record-item__remark-text">{{ v.approveRemark }}</text>
|
<text class="record-item__remark-text">{{ v.approveRemark }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
+2
-34
@@ -7,7 +7,7 @@
|
|||||||
<view class="pagesIndex">
|
<view class="pagesIndex">
|
||||||
<view class="index-header">
|
<view class="index-header">
|
||||||
<view class="index-header__left">
|
<view class="index-header__left">
|
||||||
<view class="index-header__title">优购商城</view>
|
<view class="index-header__title">康源家园</view>
|
||||||
<view class="index-header__subtitle">AI店铺 · 一人店铺 · 共建共享</view>
|
<view class="index-header__subtitle">AI店铺 · 一人店铺 · 共建共享</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="index-notice-btn" @click="goNotice"></view>
|
<view class="index-notice-btn" @click="goNotice"></view>
|
||||||
@@ -165,38 +165,6 @@
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
let nav = ref([
|
|
||||||
{
|
|
||||||
icon: 'i1.png',
|
|
||||||
title: '大健康',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: 'i2.png',
|
|
||||||
title: '大农业',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: 'i3.png',
|
|
||||||
title: '大文旅',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: 'i4.png',
|
|
||||||
title: '本地生活',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: 'i5.png',
|
|
||||||
title: '数据处理',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: 'i6.png',
|
|
||||||
title: '跨境电商',
|
|
||||||
url: '',
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const getBanner = () => {
|
const getBanner = () => {
|
||||||
api
|
api
|
||||||
@@ -217,7 +185,7 @@
|
|||||||
categoryId: 1,
|
categoryId: 1,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
tagList.value = res.data;
|
tagList.value = [res.data[res.data.length-1]];
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
// 消息通知
|
// 消息通知
|
||||||
|
|||||||
+31
-31
@@ -111,7 +111,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view
|
||||||
v-if="showThirdPartyServiceCard"
|
v-if="showThirdPartyServiceCard&&false"
|
||||||
class="card card5 third-party-card bg24"
|
class="card card5 third-party-card bg24"
|
||||||
>
|
>
|
||||||
<view class="card_title">第三方服务</view>
|
<view class="card_title">第三方服务</view>
|
||||||
@@ -230,41 +230,41 @@
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
let menuList = ref([
|
let menuList = ref([
|
||||||
{
|
// {
|
||||||
name: '邀请好友',
|
// name: '邀请好友',
|
||||||
icon: 'home/icon1.png',
|
// icon: 'home/icon1.png',
|
||||||
url: '/pages/home/share',
|
// url: '/pages/home/share',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
name: '收货地址',
|
name: '收货地址',
|
||||||
icon: 'home/icon2.png',
|
icon: 'home/icon2.png',
|
||||||
url: '/pages/user/address/list',
|
url: '/pages/user/address/list',
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
name: '联系客服',
|
// name: '联系客服',
|
||||||
icon: 'home/icon3.png',
|
// icon: 'home/icon3.png',
|
||||||
url: '',
|
// url: '',
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: '意见反馈',
|
// name: '意见反馈',
|
||||||
icon: 'home/icon4.png',
|
// icon: 'home/icon4.png',
|
||||||
url: '/pages/home/feedback',
|
// url: '/pages/home/feedback',
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: '我的收藏',
|
// name: '我的收藏',
|
||||||
icon: 'home/icon5.png',
|
// icon: 'home/icon5.png',
|
||||||
url: '/pages/user/goods-collect',
|
// url: '/pages/user/goods-collect',
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: '我的收益',
|
// name: '我的收益',
|
||||||
icon: 'home/icon6.png',
|
// icon: 'home/icon6.png',
|
||||||
url: '/pages/home/agency',
|
// url: '/pages/home/agency',
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: '我的社员',
|
// name: '我的社员',
|
||||||
icon: 'home/icon8.png',
|
// icon: 'home/icon8.png',
|
||||||
url: '/pages/home/staff',
|
// url: '/pages/home/staff',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
name: '设置',
|
name: '设置',
|
||||||
icon: 'home/icon7.png',
|
icon: 'home/icon7.png',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<view class="login_con w100 flex-column ju-between">
|
<view class="login_con w100 flex-column ju-between">
|
||||||
<view class="login_top">
|
<view class="login_top">
|
||||||
<view class="font-Heavy size52 c1">Hello!</view>
|
<view class="font-Heavy size52 c1">Hello!</view>
|
||||||
<view class="font-Heavy size52 c1">欢迎使用优购商城</view>
|
<view class="font-Heavy size52 c1">欢迎使用康源家园</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="bottomCon">
|
<view class="bottomCon">
|
||||||
<view class="login_bottom">
|
<view class="login_bottom">
|
||||||
|
|||||||
Reference in New Issue
Block a user