diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index bbd9ea05c..89b6b1bdb 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://127.0.0.1:8081/' +VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/' # http://192.168.0.121:8080/ diff --git a/fuintAdmin/src/views/integral/settings/index.vue b/fuintAdmin/src/views/integral/settings/index.vue index 7064b478f..65bc52722 100644 --- a/fuintAdmin/src/views/integral/settings/index.vue +++ b/fuintAdmin/src/views/integral/settings/index.vue @@ -1,232 +1,82 @@ @@ -251,12 +101,23 @@ export default { } }; return { + tablist: [ + { + name: '每日签到', + }, + { + name: '积分规则', + }, - + ], + activeindex: 0, activeName: 'first', rules:{ + desc: [ + { required: true, message: '不能为空', trigger: 'blur' } + ], refuelPointsRules:[ { required: true, message: '请选择积分规则', trigger: 'change' } ], @@ -367,7 +228,23 @@ export default { pointsRules: '' }, - + options: [{ + value: '选项1', + label: '黄金糕' + }, { + value: '选项2', + label: '双皮奶' + }, { + value: '选项3', + label: '蚵仔煎' + }, { + value: '选项4', + label: '龙须面' + }, { + value: '选项5', + label: '北京烤鸭' + }], + value: '' } @@ -454,4 +331,77 @@ export default { background-color: #f9f9f9; border: 1px solid rgb(196, 196, 196) } + +.tab-box { + width: 100%; + background: #fff; + display: flex; + box-sizing: border-box; + padding: 0px 50px; +} + +.f-box { + height: 40px; + color: #999999; + margin-right: 50px; + display: flex; + align-items: center; + +} + +.active { + color: #FF9655 !important; + border-bottom: 2px solid #FF9655 !important; +} + +.container { + background: #F4F5F9; + box-sizing: border-box; + //padding: 20px; +} + +.tabder-box { + width: 85%; +} +.cor{ + box-sizing: border-box; + padding: 15px; + background: #f9f9f9; + +} +.bai-box{ + border-radius: 10px; + background: #fff; + box-sizing: border-box; + padding: 10px; + height: 85vh; +} +.qizhi{ + width: 100%; + border-radius: 8px; + padding: 20px; + color: #FF9655; + font-size: 16px; + background: rgba(255,150,85,0.15); + align-items: center; + display: flex; + margin-bottom: 30px; +} +.left-icon{ + width: 45px; + height: 45px; + border-radius: 50%; + background: #FF9655; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + font-size: 40px; + font-weight: bold; + margin-right: 25px; +} +.bigsize{ + font-size: 24px; + margin-bottom: 15px; +} diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development index c01773e72..339e432ec 100644 --- a/fuintAdmin_zt/.env.development +++ b/fuintAdmin_zt/.env.development @@ -14,7 +14,7 @@ VUE_APP_PUBLIC_PATH = '/' -VUE_APP_SERVER_URL = 'http://127.0.0.1:8081/' +VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/' # cp端地址 diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue index 6adc33bb6..859fd5ce9 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue @@ -48,7 +48,7 @@ -
+
@@ -95,7 +95,7 @@
- + diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue index 011860c1a..3495482b4 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/record.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue @@ -51,7 +51,7 @@ -
+
diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index 182c31ada..624fcef4d 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -90,8 +90,8 @@ { "path": "QRcode/QRcode", "style": { - "navigationBarTitleText": "二维码", - "navigationStyle": "custom" + "navigationBarTitleText": "储值卡付款码" + } }, { @@ -153,7 +153,7 @@ { "path": "Pointsdetail/Pointsdetail", "style": { - "navigationBarTitleText": "积分规则", + "navigationBarTitleText": "", "navigationStyle": "custom" } }, @@ -355,4 +355,4 @@ "backgroundColor": "#F8F8F8" }, "uniIdRouter": {} -} \ No newline at end of file +} diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index a9d25746e..1c968e58e 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -3,7 +3,7 @@ 储值卡 - + @@ -20,7 +20,8 @@ 囤油卡 - + + 汽油92# 7.28元/L @@ -82,6 +83,11 @@ this.getUserBalance() }, methods: { + goCode() { + uni.navigateTo({ + url: '/pagesHome/QRcode/QRcode' + }) + }, gocard(id) { uni.navigateTo({ url: '/pagesHome/oilRecharge/oilRecharge?id=' + id @@ -352,4 +358,4 @@ text-align: right; } - \ No newline at end of file + diff --git a/gasStation-uni/pagesHome/QRcode/QRcode.vue b/gasStation-uni/pagesHome/QRcode/QRcode.vue index 551e4692b..a01da578b 100644 --- a/gasStation-uni/pagesHome/QRcode/QRcode.vue +++ b/gasStation-uni/pagesHome/QRcode/QRcode.vue @@ -1,17 +1,19 @@