Compare commits

..

No commits in common. '02627d6b8a7b59de002f3d8dcfcb31422a8eaefa' and 'e03732d651f34a014b0be113adc5cbe0789357d0' have entirely different histories.

@ -1,15 +1,14 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 VUE_APP_TITLE = 会员演示营销管理系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 李学武牡丹瓷官方旗舰店/开发环境 # 会员演示营销系统/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 发布目录 # 发布目录
VUE_APP_PUBLIC_PATH = '/' VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址 # 后端接口地址
#VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/' VUE_APP_SERVER_URL = 'http://127.0.0.1:8999/'
VUE_APP_SERVER_URL = 'http://192.168.10.70:8999/'

@ -1,10 +1,10 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 VUE_APP_TITLE = 会员演示营销管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# 李学武牡丹瓷官方旗舰店/生产环境 # 会员演示营销系统/生产环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 发布目录 # 发布目录

@ -1,10 +1,10 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 李学武牡丹瓷官方旗舰店 VUE_APP_TITLE = 会员演示营销管理系统
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'staging'
# 李学武牡丹瓷官方旗舰店/测试环境 # 会员演示营销系统/测试环境
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/stage-api'
# 发布目录 # 发布目录

@ -1,7 +1,7 @@
{ {
"name": "fuintAdmin", "name": "fuintAdmin",
"version": "3.0.3", "version": "3.0.3",
"description": "李学武牡丹瓷官方旗舰店", "description": "会员演示营销系统后台管理端",
"author": "FSQ", "author": "FSQ",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {

@ -65,9 +65,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="copy-right"> <div class="copy-right">
<span>华码科技 © 2022-2024 <span>Copyright © 2022-2024 <a class="link" href="https://www.baidu.com">演示</a> All Rights Reserved.</span>
<!-- <a class="link" href="https://www.baidu.com">演示</a>-->
All Rights Reserved.</span>
</div> </div>
</div> </div>
</div> </div>

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '李学武牡丹瓷官方旗舰店' // 网页标题 const name = process.env.VUE_APP_TITLE || '会员演示营销管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 81 // 端口 const port = process.env.port || process.env.npm_config_port || 81 // 端口

@ -3,8 +3,7 @@ module.exports = {
name: '会员系统', name: '会员系统',
// 必填: 后端api地址, 斜杠/结尾 // 必填: 后端api地址, 斜杠/结尾
// apiUrl: 'http://192.168.1.103:8999/', // apiUrl: 'http://192.168.1.103:8999/',
// apiUrl: 'http://192.168.10.31:8999/',//服务器 apiUrl: 'http://192.168.10.31:8999/',//服务器
apiUrl: 'http://192.168.10.70:8999/',
// 必填: 默认商户号,从后台商户列表获取 // 必填: 默认商户号,从后台商户列表获取
merchantNo: '10001', merchantNo: '10001',
} }

@ -5,26 +5,22 @@
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"fontSize":"30rpx", "fontSize":"30rpx",
"list": [ "list": [{
{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "static/tabbar/home.png", "iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home-active.png", "selectedIconPath": "static/tabbar/home-active.png",
"text": "首页" "text": "首页"
}, }, {
{
"pagePath": "pages/category/index", "pagePath": "pages/category/index",
"iconPath": "static/tabbar/shop.png", "iconPath": "static/tabbar/shop.png",
"selectedIconPath": "static/tabbar/shop-active.png", "selectedIconPath": "static/tabbar/shop-active.png",
"text": "微店" "text": "微店"
}, },{
{
"pagePath": "pages/user/index", "pagePath": "pages/user/index",
"iconPath": "static/tabbar/user.png", "iconPath": "static/tabbar/user.png",
"selectedIconPath": "static/tabbar/user-active.png", "selectedIconPath": "static/tabbar/user-active.png",
"text": "我的" "text": "我的"
} }]
]
}, },
"pages": [ "pages": [
{ {
@ -346,18 +342,6 @@
"style": { "style": {
"navigationBarTitleText": "卡券兑换" "navigationBarTitleText": "卡券兑换"
} }
},
{
"path": "pages/companyInformation/companyInformation",
"style": {
"navigationBarTitleText": "公司信息"
}
},
{
"path": "pages/companyDetil/companyDetil",
"style": {
"navigationBarTitleText": "公司详情"
}
} }
], ],
"globalStyle": { "globalStyle": {

@ -104,9 +104,9 @@
</view> </view>
<view class="tel">联系电话{{ storeList.phone }}</view> <view class="tel">联系电话{{ storeList.phone }}</view>
</view> </view>
<!-- <view class="loc-info"> <view class="loc-info">
<text class="dis"><text class="distance">{{ parseFloat(storeList.distance).toFixed(1) }}</text>公里</text> <text class="dis"><text class="distance">{{ parseFloat(storeList.distance).toFixed(1) }}</text>公里</text>
</view> --> </view>
</view> </view>
</u-modal> </u-modal>

@ -15,15 +15,15 @@
</block> </block>
<!-- <block> <block>
咨讯 咨讯
<News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/> <!-- <News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/> -->
</block> --> </block>
<block> <!-- <block>
<NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/> <NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/>
</block> </block> -->
<block> <block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/> <Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</block> </block>
@ -67,15 +67,11 @@
"background": "#ffffff", "background": "#ffffff",
}, },
"navBar": [{ "navBar": [{
// "imgUrl": "/static/nav/1.png", "imgUrl": "/static/nav/1.png",
"imgUrl": "/static/nav/gsxx.png",
"imgName": "icon-1.png", "imgName": "icon-1.png",
// "linkUrl": "pages\/pay\/index", "linkUrl": "pages\/pay\/index",
// "text": "", "text": "买单支付",
"linkUrl": "pages\/companyInformation\/companyInformation", "tip": "支付攒积分",
"text": "公司信息",
// "tip": "",
"tip": "公司信息",
"color": "#666666" "color": "#666666"
}, { }, {
"imgUrl": "/static/nav/3.png", "imgUrl": "/static/nav/3.png",

Loading…
Cancel
Save