diff --git a/apis/interfaces/wallet.js b/apis/interfaces/wallet.js index 94b6a86..8242b2a 100644 --- a/apis/interfaces/wallet.js +++ b/apis/interfaces/wallet.js @@ -138,7 +138,7 @@ const keyrules = () => { }) } -// 能量球转红包前置，获取能量球的基本信息 +// 通证转红包前置，获取通证的基本信息 const accountCashs = (data) => { return request({ url: 'user/account/cashs', diff --git a/apis/interfaces/withdraws.js b/apis/interfaces/withdraws.js index ffd72af..dbe36dc 100644 --- a/apis/interfaces/withdraws.js +++ b/apis/interfaces/withdraws.js @@ -82,7 +82,7 @@ const withdrawsIndexLists = (data) => { }) } -// 能量碎片记录 +// 积分记录 const userAccoutScores = (data) => { return request({ url: 'user/account/scores', @@ -91,7 +91,7 @@ const withdrawsIndexLists = (data) => { }) } - // 能量球转红包前置 + // 通证转红包前置 const cashsCreate = () => { return request({ url: 'user/account/cashs/create', @@ -99,7 +99,7 @@ const withdrawsIndexLists = (data) => { }) } - // 能量球转红包 + // 通证转红包 const accountCashs = (data) => { return request({ url: 'user/account/cashs', diff --git a/components/property/record.vue b/components/property/record.vue index 9a13a48..0590a14 100644 --- a/components/property/record.vue +++ b/components/property/record.vue @@ -2,7 +2,7 @@ - {{item.rule.title}} {{item.coin?' ('+item.coin+'个能量球) ':''}} + {{item.rule.title}} {{item.coin?' ('+item.coin+'个通证) ':''}} {{item.created_at || '-'}} {{item.amount}} diff --git a/pages.json b/pages.json index cd15f3a..976c57d 100644 --- a/pages.json +++ b/pages.json @@ -14,31 +14,31 @@ "auth": true, "style": { "navigationBarTitleText": "发现更多", - "navigationStyle": "custom", + "navigationStyle": "custom", "navigationBarTextStyle": "white" } }, { "path": "pages/user/index", "name": "User", "auth": true, - "style": { - "navigationBarTitleText": "节点中心", - "navigationStyle":"custom", - "navigationBarTextStyle": "white", - "app-plus":{ - "titleNView": { - "type": "transparent", - "backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)", - "buttons": [{ - "text": "\ue601", - "fontSrc":"/static/iconfont.ttf", - "background": "rgba(0,0,0,0)" - },{ - "text": "\ue602", - "fontSrc":"/static/iconfont.ttf", - "background": "rgba(0,0,0,0)" - }] - } + "style": { + "navigationBarTitleText": "节点中心", + "navigationStyle":"custom", + "navigationBarTextStyle": "white", + "app-plus":{ + "titleNView": { + "type": "transparent", + "backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)", + "buttons": [{ + "text": "\ue601", + "fontSrc":"/static/iconfont.ttf", + "background": "rgba(0,0,0,0)" + },{ + "text": "\ue602", + "fontSrc":"/static/iconfont.ttf", + "background": "rgba(0,0,0,0)" + }] + } } } }, { @@ -109,16 +109,16 @@ "path": "pages/goods/management", "name": "goodsManagement", "style": { - "navigationBarTitleText": "商品权证管理", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "发布", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "商品权证管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "发布", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { @@ -143,32 +143,32 @@ "path": "pages/coupons/management", "name": "couponsManagement", "style": { - "navigationBarTitleText": "优惠券管理", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "创建", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "优惠券管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "创建", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { "path": "pages/coupons/add", "name": "couponsAdd", "style": { - "navigationBarTitleText": "创建优惠券", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "发布", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "创建优惠券", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "发布", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { @@ -242,9 +242,9 @@ "path": "pages/wallet/property", "name": "walletProperty", "style": { - "navigationBarTitleText": "能量钱包", + "navigationBarTitleText": "通证钱包", "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "white", "navigationBarBackgroundColor":"#976dff" } }, { @@ -253,7 +253,7 @@ "style": { "navigationBarTitleText": "现金红包", "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "white", "navigationBarBackgroundColor":"#976dff" } }, @@ -261,7 +261,7 @@ "path": "pages/wallet/extract", "name": "Extract", "style": { - "navigationBarTitleText": "提现能量", + "navigationBarTitleText": "提现通证", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#976dff", "navigationBarTextStyle": "white" @@ -295,16 +295,16 @@ "name": "shopLists", "auth": true, "style": { - "navigationBarTitleText": "门店管理", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "添加", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "门店管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "添加", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { @@ -312,23 +312,23 @@ "name": "shopCreate", "auth": true, "style": { - "navigationBarTitleText": "创建门店" + "navigationBarTitleText": "创建门店" } }, { "path": "pages/employees/list", "name": "employeesList", "auth": true, "style": { - "navigationBarTitleText": "员工管理", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "添加", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "员工管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "添加", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { @@ -336,16 +336,16 @@ "name": "employeesAdd", "auth": true, "style": { - "navigationBarTitleText": "添加员工", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "保存", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "添加员工", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "保存", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { @@ -360,23 +360,23 @@ "name": "instrumentBasics", "auth": true, "style": { - "navigationBarTitleText": "基础信息", - "app-plus":{ - "titleNView": { - "buttons": [{ - "text": "保存", - "width": "78px", - "fontSize": "15px", - "color":"#8b64fd" - }] - } + "navigationBarTitleText": "基础信息", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "保存", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } } } }, { "path": "pages/wallet/fragment", "name": "Fragment", "style": { - "navigationBarTitleText": "能量碎片记录", + "navigationBarTitleText": "积分记录", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" @@ -422,9 +422,9 @@ } ], "globalStyle": { - "backgroundColor": "#F5F5F5", - "navigationBarBackgroundColor":"#FFFFFF", - "navigationBarTextStyle":"black" + "backgroundColor": "#F5F5F5", + "navigationBarBackgroundColor":"#FFFFFF", + "navigationBarTextStyle":"black" }, "tabBar": { "borderStyle": "white", @@ -434,7 +434,7 @@ "spacing": "0", "height": "60px", "list": [{ - "text": "发现能量", + "text": "发现通证", "iconPath": "static/tabBar/tabBar_icon_00.png", "selectedIconPath": "static/tabBar/tabBar_show_00.png", "pagePath": "pages/index/index" @@ -453,4 +453,4 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" } -} +} diff --git a/pages/found/index.vue b/pages/found/index.vue index cf5c410..21709ea 100644 --- a/pages/found/index.vue +++ b/pages/found/index.vue @@ -9,7 +9,7 @@ 签到成功 - 能量碎片+{{sign.signSuccess}} + 积分+{{sign.signSuccess}} @@ -17,7 +17,7 @@ 发现更多 - 海量能量碎片等你解锁 + 海量积分等你解锁 @@ -39,25 +39,25 @@ - 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片 + 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个积分 - 签到领取能量碎片 + 签到领取积分 - 能量碎片记录 + 积分记录 - 能量碎片任务 + 积分任务 { this.productedAt = res.producted_at this.expiriedAt = res.expiried_at @@ -97,6 +97,7 @@ methods: { // picker选择 pickerChange(e, key){ + console.log(key,e.detail.value) this[key] = e.detail.value }, // 图片预览 @@ -126,7 +127,7 @@ uni.showToast({ title: err.message, icon : 'none' - }) + }) }) } }) diff --git a/pages/goods/management.vue b/pages/goods/management.vue index 83263c9..e00f693 100644 --- a/pages/goods/management.vue +++ b/pages/goods/management.vue @@ -19,7 +19,7 @@ - + @@ -101,14 +101,15 @@ cancelText : '确定', success : res => { if(res.confirm){ - this.$Router.push({name: 'GoodsMagAdd', params: {type: 'edit', id}}) + console.log(res.confirm) + this.$Router.push({name: 'goodsAdd', params: {type: 'edit', id}}) } } }) }, // 商品认证 goodsAuth(id){ - this.$Router.push({name: 'goodsAuth', params: {id, type: 'magList'}}) + this.$Router.push({name: 'goodsAddAuth', params: {id, type: 'magList'}}) }, // 燃烧，增发 openLay(item, type){ @@ -217,6 +218,9 @@ .tabs{ position: fixed; top: 0; + //#ifdef H5 + top: 90rpx; + // #endif left: 0; right: 0; z-index: 99; diff --git a/pages/index/index.vue b/pages/index/index.vue index 53c1cec..ec71118 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,615 +1,713 @@ - - - - - - - + + + } + + // 任务 + .task-block { + white-space: nowrap; + margin-bottom: $margin; + + .item { + background: $block-color; + display: inline-block; + margin-left: $margin; + width: 260rpx; + border-radius: $radius; + text-align: center; + padding: ($padding - 10) $padding/2; + + &:first-child { + margin-left: $margin; + } + + &:last-child { + margin-right: $margin; + } + + .icon { + display: inline-block; + margin: ($margin/2) 0; + width: 98rpx; + height: 98rpx; + line-height: 98rpx; + background: #1f183d; + border-radius: 50%; + text-align: center; + + image { + width: 56rpx; + height: 56rpx; + vertical-align: middle; + } + } + + .text { + font-size: $title-size-sm; + color: rgba($color: white, $alpha: .4); + line-height: 40rpx; + } + + .title { + font-size: $title-size-lg; + color: white; + font-weight: bold; + line-height: 50rpx; + } + + .submit-title { + font-size: $title-size-sm - 4; + color: rgba($color: white, $alpha: .4); + line-height: 40rpx; + } + } + } + diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue index 5d5b48e..79b6d0b 100644 --- a/pages/instrument/Spread.vue +++ b/pages/instrument/Spread.vue @@ -1,237 +1,325 @@ diff --git a/pages/instrument/basics.vue b/pages/instrument/basics.vue index e9a6b98..6cadbf8 100644 --- a/pages/instrument/basics.vue +++ b/pages/instrument/basics.vue @@ -31,25 +31,17 @@ 删除 - - + + @longpress="removeImg('imgs', moduleIndex, index)" /> - + 上传图片 @@ -64,118 +56,123 @@ - + @longpress="removeImg('videoCover', moduleIndex, '')" /> - + 上传视频封面 - - 点击查看封面/视频，长按删除封面/视频 + 点击查看封面/视频，长按删除封面 + 长按删除视频 + - 添加模块 + + 添加模块 +