Compare commits

..

2 Commits

@ -1,14 +1,15 @@
# 页面标题 # 页面标题
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,7 +65,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="copy-right"> <div class="copy-right">
<span>Copyright © 2022-2024 <a class="link" href="https://www.baidu.com">演示</a> All Rights Reserved.</span> <span>华码科技 © 2022-2024
<!-- <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,7 +3,8 @@ 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',
} }

@ -6,4 +6,4 @@
"keywords": [ "keywords": [
"数字键盘、密码键盘、支付键盘" "数字键盘、密码键盘、支付键盘"
] ]
} }

@ -1,359 +1,375 @@
{ {
"tabBar": { "tabBar": {
"color": "#000000", "color": "#000000",
"selectedColor": "#ff0000", "selectedColor": "#ff0000",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"fontSize":"30rpx", "fontSize": "30rpx",
"list": [{ "list": [
"pagePath": "pages/index/index", {
"iconPath": "static/tabbar/home.png", "pagePath": "pages/index/index",
"selectedIconPath": "static/tabbar/home-active.png", "iconPath": "static/tabbar/home.png",
"text": "首页" "selectedIconPath": "static/tabbar/home-active.png",
}, { "text": "首页"
"pagePath": "pages/category/index", },
"iconPath": "static/tabbar/shop.png", {
"selectedIconPath": "static/tabbar/shop-active.png", "pagePath": "pages/category/index",
"text": "微店" "iconPath": "static/tabbar/shop.png",
},{ "selectedIconPath": "static/tabbar/shop-active.png",
"pagePath": "pages/user/index", "text": "微店"
"iconPath": "static/tabbar/user.png", },
"selectedIconPath": "static/tabbar/user-active.png", {
"text": "我的" "pagePath": "pages/user/index",
}] "iconPath": "static/tabbar/user.png",
}, "selectedIconPath": "static/tabbar/user-active.png",
"pages": [ "text": "我的"
{ }
"path": "pages/index/index", ]
"style": { },
"navigationBarTitleText": "首页", "pages": [
"navigationBarBackgroundColor": "#00acac", {
"navigationBarTextStyle": "white", "path": "pages/index/index",
"enablePullDownRefresh": true "style": {
} "navigationBarTitleText": "首页",
}, "navigationBarBackgroundColor": "#00acac",
{ "navigationBarTextStyle": "white",
"path": "pages/category/index", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "微店", },
"navigationBarBackgroundColor": "#00acac", {
"navigationBarTextStyle": "white" "path": "pages/category/index",
} "style": {
}, "navigationBarTitleText": "微店",
{ "navigationBarBackgroundColor": "#00acac",
"path": "pages/cart/index", "navigationBarTextStyle": "white"
"style": { }
"navigationBarTitleText": "购物车" },
} {
}, "path": "pages/cart/index",
{ "style": {
"path": "pages/user/index", "navigationBarTitleText": "购物车"
"style": { }
"navigationBarTitleText": "会员中心", },
"enablePullDownRefresh": true {
} "path": "pages/user/index",
}, "style": {
{ "navigationBarTitleText": "会员中心",
"path": "pages/user/setting", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "个人信息" },
} {
}, "path": "pages/user/setting",
{ "style": {
"path": "pages/user/code", "navigationBarTitleText": "个人信息"
"style": { }
"navigationBarTitleText": "我的会员码" },
} {
}, "path": "pages/user/code",
{ "style": {
"path": "pages/user/card", "navigationBarTitleText": "我的会员码"
"style": { }
"navigationBarTitleText": "领取会员卡" },
} {
}, "path": "pages/user/card",
{ "style": {
"path": "pages/user/password", "navigationBarTitleText": "领取会员卡"
"style": { }
"navigationBarTitleText": "我的密码" },
} {
}, "path": "pages/user/password",
{ "style": {
"path": "pages/custom/index", "navigationBarTitleText": "我的密码"
"style": { }
"enablePullDownRefresh": true },
} {
}, "path": "pages/custom/index",
{ "style": {
"path": "pages/search/index", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "商品搜索" },
} {
}, "path": "pages/search/index",
{ "style": {
"path": "pages/location/index", "navigationBarTitleText": "商品搜索"
"style": { }
"navigationBarTitleText": "切换店铺" },
} {
}, "path": "pages/location/index",
{ "style": {
"path": "pages/login/index", "navigationBarTitleText": "切换店铺"
"style": { }
"navigationBarTitleText": "会员登录" },
} {
}, "path": "pages/login/index",
{ "style": {
"path": "pages/login/auth", "navigationBarTitleText": "会员登录"
"style": { }
"navigationBarTitleText": "授权登录" },
} {
}, "path": "pages/login/auth",
{ "style": {
"path": "pages/help/index", "navigationBarTitleText": "授权登录"
"style": { }
"navigationBarTitleText": "帮助中心" },
} {
}, "path": "pages/help/index",
{ "style": {
"path": "pages/coupon/list", "navigationBarTitleText": "帮助中心"
"style": { }
"navigationBarTitleText": "领券中心" },
} {
}, "path": "pages/coupon/list",
{ "style": {
"path": "pages/coupon/detail", "navigationBarTitleText": "领券中心"
"style": { }
"navigationBarTitleText": "优惠券详情" },
} {
}, "path": "pages/coupon/detail",
{ "style": {
"path": "pages/timer/detail", "navigationBarTitleText": "优惠券详情"
"style": { }
"navigationBarTitleText": "计次卡详情", },
"enablePullDownRefresh": true {
} "path": "pages/timer/detail",
}, "style": {
{ "navigationBarTitleText": "计次卡详情",
"path": "pages/prestore/buy", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "购买储值卡", },
"enablePullDownRefresh": true {
} "path": "pages/prestore/buy",
}, "style": {
{ "navigationBarTitleText": "购买储值卡",
"path": "pages/prestore/detail", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "储值卡详情", },
"enablePullDownRefresh": true {
} "path": "pages/prestore/detail",
}, "style": {
{ "navigationBarTitleText": "储值卡详情",
"path": "pages/confirm/doConfirm", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "核销确认" },
} {
}, "path": "pages/confirm/doConfirm",
{ "style": {
"path": "pages/confirm/result", "navigationBarTitleText": "核销确认"
"style": { }
"navigationBarTitleText": "核销结果" },
} {
}, "path": "pages/confirm/result",
{ "style": {
"path": "pages/goods/list", "navigationBarTitleText": "核销结果"
"style": { }
"navigationBarTitleText": "商品列表", },
"enablePullDownRefresh": true {
} "path": "pages/goods/list",
}, "style": {
{ "navigationBarTitleText": "商品列表",
"path": "pages/goods/detail", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "商品详情" },
} {
}, "path": "pages/goods/detail",
{ "style": {
"path": "pages/my-coupon/index", "navigationBarTitleText": "商品详情"
"style": { }
"navigationBarTitleText": "我的卡券", },
"enablePullDownRefresh": true {
} "path": "pages/my-coupon/index",
}, "style": {
{ "navigationBarTitleText": "我的卡券",
"path": "pages/address/index", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "收货地址" },
} {
}, "path": "pages/address/index",
{ "style": {
"path": "pages/address/create", "navigationBarTitleText": "收货地址"
"style": { }
"navigationBarTitleText": "新增收货地址" },
} {
}, "path": "pages/address/create",
{ "style": {
"path": "pages/address/update", "navigationBarTitleText": "新增收货地址"
"style": { }
"navigationBarTitleText": "编辑收货地址" },
} {
}, "path": "pages/address/update",
{ "style": {
"path": "pages/points/detail", "navigationBarTitleText": "编辑收货地址"
"style": { }
"navigationBarTitleText": "积分明细" },
} {
}, "path": "pages/points/detail",
{ "style": {
"path": "pages/points/gift", "navigationBarTitleText": "积分明细"
"style": { }
"navigationBarTitleText": "积分转赠" },
} {
}, "path": "pages/points/gift",
{ "style": {
"path": "pages/give/index", "navigationBarTitleText": "积分转赠"
"style": { }
"navigationBarTitleText": "转赠记录" },
} {
}, "path": "pages/give/index",
{ "style": {
"path": "pages/wallet/index", "navigationBarTitleText": "转赠记录"
"style": { }
"navigationBarTitleText": "我的余额" },
} {
}, "path": "pages/wallet/index",
{ "style": {
"path": "pages/wallet/recharge/index", "navigationBarTitleText": "我的余额"
"style": { }
"navigationBarTitleText": "我要充值" },
} {
}, "path": "pages/wallet/recharge/index",
{ "style": {
"path": "pages/wallet/recharge/order", "navigationBarTitleText": "我要充值"
"style": { }
"navigationBarTitleText": "充值记录" },
} {
}, "path": "pages/wallet/recharge/order",
{ "style": {
"path": "pages/wallet/balance/log", "navigationBarTitleText": "充值记录"
"style": { }
"navigationBarTitleText": "账单详情" },
} {
}, "path": "pages/wallet/balance/log",
{ "style": {
"path": "pages/settlement/index", "navigationBarTitleText": "账单详情"
"style": { }
"navigationBarTitleText": "结算中心" },
} {
}, "path": "pages/settlement/index",
{ "style": {
"path": "pages/settlement/goods", "navigationBarTitleText": "结算中心"
"style": { }
"navigationBarTitleText": "订单确认" },
} {
}, "path": "pages/settlement/goods",
{ "style": {
"path": "pages/order/index", "navigationBarTitleText": "订单确认"
"style": { }
"navigationBarTitleText": "我的订单", },
"enablePullDownRefresh": true {
} "path": "pages/order/index",
}, "style": {
{ "navigationBarTitleText": "我的订单",
"path": "pages/order/detail", "enablePullDownRefresh": true
"style": { }
"navigationBarTitleText": "订单详情", },
"navigationBarTextStyle": "white", {
"navigationBarBackgroundColor": "#00acac" "path": "pages/order/detail",
} "style": {
}, "navigationBarTitleText": "订单详情",
{ "navigationBarTextStyle": "white",
"path": "pages/order/result", "navigationBarBackgroundColor": "#00acac"
"style": { }
"navigationBarTitleText": "支付结果" },
} {
}, "path": "pages/order/result",
{ "style": {
"path": "pages/refund/index", "navigationBarTitleText": "支付结果"
"style": { }
"navigationBarTitleText": "退换/售后" },
} {
}, "path": "pages/refund/index",
{ "style": {
"path": "pages/refund/detail", "navigationBarTitleText": "退换/售后"
"style": { }
"navigationBarTitleText": "售后详情" },
} {
}, "path": "pages/refund/detail",
{ "style": {
"path": "pages/refund/apply", "navigationBarTitleText": "售后详情"
"style": { }
"navigationBarTitleText": "申请售后" },
} {
}, "path": "pages/refund/apply",
{ "style": {
"path": "pages/pay/index", "navigationBarTitleText": "申请售后"
"style": { }
"navigationBarTitleText": "向商家付款" },
} {
}, "path": "pages/pay/index",
{ "style": {
"path": "pages/pay/result", "navigationBarTitleText": "向商家付款"
"style": { }
"navigationBarTitleText": "支付结果" },
} {
}, "path": "pages/pay/result",
{ "style": {
"path": "pages/merchant/index", "navigationBarTitleText": "支付结果"
"style": { }
"navigationBarTitleText": "商家管理" },
} {
}, "path": "pages/merchant/index",
{ "style": {
"path": "pages/pay/cashier", "navigationBarTitleText": "商家管理"
"style": { }
"navigationBarTitleText": "扫码收款" },
} {
}, "path": "pages/pay/cashier",
{ "style": {
"path": "pages/merchant/member/index", "navigationBarTitleText": "扫码收款"
"style": { }
"navigationBarTitleText": "会员列表" },
} {
}, "path": "pages/merchant/member/index",
{ "style": {
"path": "pages/merchant/order/index", "navigationBarTitleText": "会员列表"
"style": { }
"navigationBarTitleText": "订单列表" },
} {
}, "path": "pages/merchant/order/index",
{ "style": {
"path": "pages/article/index", "navigationBarTitleText": "订单列表"
"style": { }
"navigationBarTitleText": "文章列表" },
} {
}, "path": "pages/article/index",
{ "style": {
"path": "pages/article/detail", "navigationBarTitleText": "文章列表"
"style": { }
"navigationBarTitleText": "文章详情" },
} {
}, "path": "pages/article/detail",
{ "style": {
"path": "pages/coupon/receive", "navigationBarTitleText": "文章详情"
"style": { }
"navigationBarTitleText": "卡券兑换" },
} {
} "path": "pages/coupon/receive",
], "style": {
"globalStyle": { "navigationBarTitleText": "卡券兑换"
"navigationBarBackgroundColor": "#ffffff", }
"navigationBarTitleText": "", },
"navigationBarTextStyle": "black", {
"backgroundTextStyle": "dark" "path": "pages/companyInformation/companyInformation",
}, "style": {
"easycom": { "navigationBarTitleText": "公司信息"
"autoscan": true, }
"custom": { },
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" {
} "path": "pages/companyDetil/companyDetil",
} "style": {
} "navigationBarTitleText": "公司详情"
}
}
],
"globalStyle": {
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTitleText": "",
"navigationBarTextStyle": "black",
"backgroundTextStyle": "dark"
},
"easycom": {
"autoscan": true,
"custom": {
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
}
}
}

@ -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,11 +67,15 @@
"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": "",
"tip": "支付攒积分", "linkUrl": "pages\/companyInformation\/companyInformation",
"text": "公司信息",
// "tip": "",
"tip": "公司信息",
"color": "#666666" "color": "#666666"
}, { }, {
"imgUrl": "/static/nav/3.png", "imgUrl": "/static/nav/3.png",

Loading…
Cancel
Save