Skip to content

W
wechat_currency
Commit f527b017 by huahua
Options

修改

parent 6e804f35
Showing with 415 additions and 62 deletions
api/UserApi.js
......@@ -7,7 +7,7 @@ import {
* 登录
* @param {*} params
*/
export const _login = (params = {}) => _request({url: '/golf/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
export const _login = (params = {}) => _request({url: '/lite/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
/**
* 查询用户信息
......
api/homeApi.js
......@@ -8,8 +8,8 @@ import {
*
* @param {*} params
*/
export const route = (params = {}) => _request({url: '/golf/index', params, method: 'post',token: true})
export const route = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true})
export const route_timeout = (params = {}) => _request({url: '/golf/index', params, method: 'post',token: true,timeout: true})
export const route_timeout = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true,timeout: true})
export const newroute = (params = {}) => _request({url: '/golf/index/index', params, method: 'post',token: true})
\ No newline at end of file
export const newroute = (params = {}) => _request({url: '/lite/index/index', params, method: 'post',token: true})
\ No newline at end of file
manifest.json
......@@ -109,7 +109,7 @@
"devServer" : {
"port" : 8088
},
"title" : "色彩公园Lite",
"title" : "色彩高尔夫",
"router" : {
"base" : ""
},
......
pages.json
{
"pages": [{
"path": "pages/index/mall",
"pages": [
/* {
"path": "pages/index/mall",
"style": {
"navigationBarTitleText": "色彩高尔夫",
// "navigationStyle":"custom",//禁用uni-app默认的头部导航
"enablePullDownRefresh": true
}
}, */
/* {
"path": "pages/index/machineDetail",
"style": {
"navigationBarTitleText": "色彩公园Lite",
"navigationBarTitleText": "色彩高尔夫",
// "navigationStyle":"custom",//禁用uni-app默认的头部导航
"enablePullDownRefresh": true
}
} */
{
"path": "pages/index/machineDetail",
"style": {
"navigationBarTitleText": "高尔夫定制",
"navigationStyle": "custom" //禁用uni-app默认的头部导航
}
},
{
"path": "pages/index/index",
"style": {
......@@ -15,6 +34,7 @@
}
}
],
"globalStyle": {
"navigationBarTextStyle": "#ffffff",
......@@ -27,20 +47,21 @@
"pages": [{
"path": "login",
"style": {
"navigationBarTitleText": "色彩公园Lite"
"navigationBarTitleText": "色彩高尔夫"
}
}]
},
{
"root": "pages/mall",
"pages": [{
"path": "machineDetail",
"style": {
"navigationBarTitleText": "色彩站详情",
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
"pages": [
/* {
"path": "machineDetail",
"style": {
"navigationBarTitleText": "色彩站详情",
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
}, */
{
"path": "lineUp",
"style": {
......
pages/index/css/main.css
......@@ -47,11 +47,13 @@
bottom: 22upx;
display: flex;
justify-content: center;
/* padding-left: 10upx; */
}
.dots .dot {
color: #F56364;
font-size: 22upx;
margin-left: 10upx;
}
/*弹性布局*/
.flex {
......
pages/index/head/head.vue
......@@ -48,7 +48,6 @@
},
created() {
console.log('设备信息')
//设备信息
let app = uni.getSystemInfoSync();
//胶囊信息
......@@ -58,7 +57,6 @@
},
methods: {
back(){
console.log('点击头部返回')
uni.navigateBack();
}
},
......
pages/index/scrollView.vue
......@@ -115,7 +115,7 @@
this.tip = '释放刷新';
},
finished() {
this.tip = '下拉刷新';
this.tip = '';
},
scroll(e) {
......
pages/index/switchGoods.vue 0 → 100644
<template>
<view>
<!-- 品牌 -->
<uni-popup ref="brandscenter" type="center" @change="change" :style="{height: (MobilePhoneHeight * 0.8) +'px'}">
<view style="width: 690upx; margin:auto; display: flex; flex-direction: column;">
<view :style="{height: (MobilePhoneHeight * 0.8) +'px'}"
style="width:100%; background: #FFFFFF; border-radius: 30upx; position: relative;">
<view @click="cancelBrand()" style="position: absolute; top: 0upx; right: 0upx;">
<image src="../../../static/icon_guanbi.png" mode=""
style="height: 23upx; width: 23upx; padding: 21upx 33upx;"></image>
</view>
<!-- <view style="margin:122upx auto 94upx;font-size: 36upx;text-align: center;">
请选择手机品牌
</view> -->
<view style="margin:62upx auto 50upx;font-size: 36upx; text-align: center;">
请选择商品
</view>
<scroll-view scroll-y scroll-with-animation
:style="{height: (MobilePhoneHeight * 0.8) - 200*pixelRate +'px'}" style="box-sizing: border-box;white-space: nowrap;
width: 510upx; margin:0 auto; overflow: hidden; margin-bottom: 50upx;">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item)">
<view style="float: left; margin: 10upx;
display: flex;align-items: center;
background: #EEEEEE;border-radius: 10upx;
height: 150upx; width: 150upx;" hover-class="brandactive" :class="[goodtext == item.name ? 'brandactive':'' ]">
<view style="width: 100%;">
<image :src="item.front_image"
style="width: 50%; height: 70upx; margin: auto; display: block;"></image>
<view style="text-align: center; font-size: 24upx; margin-top: 10upx; width: 95%; margin: auto;
overflow: hidden; text-overflow: ellipsis; white-space: nowrap;word-break:break-all;">
{{item.name || ''}}
</view>
</view>
</view>
</view>
</scroll-view>
<!-- 无数据 -->
<view v-if="catrgoryList.length < 0" style="text-align: center; color: #BEBEBE;">该设备没有库存</view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
import homeservice from '@/service/homeservice.js';
import uniPopup from '../index/common/uni-popup/uni-popup.vue';
import mpvuePicker from '@/components/mpvue-picker/mpvuePicker.vue';
var _self;
var canvaPie = null;
export default {
props: {
// windowHeight: {
// type: Number,
// default: 1
// },
// pixelRate: {
// type: Number,
// default: 1
// },
},
components: {
uniPopup,
mpvuePicker
},
data() {
return {
goodtext: '', //选择商品名称
goods: [],
currentId: 0,
/* 控制被选中 */
currentIndex: 0,
/* 控制位置 */
goodsitem: null,
queryPage: {
s: 'Material.list',
},
};
},
mounted() {},
methods: {
//商品点击事件
goodclick(e) {
this.goodtext = e.name //选择商品名
this.$refs['brandscenter'].close();
this.$emit('selectGoodItem', {
id: e.id,
name: e.name, //手机壳信息
})
},
//打开页面
open() {
this.getGooods();
//this.$refs['brandscenter'].open();
},
//获取商品列表
getGooods() {
homeservice.queryList({
s: 'Product.getCommonGoods', //新接口
}).then(result => {
this.goods = result;
this.$refs['brandscenter'].open();
}).catch(err => {
uni.showToast({
title: err.msg,
icon: 'none'
});
});
},
change(e) {},
},
onShow(options) {},
}
</script>
<style lang="scss">
.classification {
width: 300upx;
height: 80upx;
line-height: 80upx;
text-align: center;
background: #EEEEEE;
border-radius: 0 0 40upx 0;
font-size: 36upx;
color: #666666;
&.active {
background: #864BC3 !important;
color: #FFFFFF !important;
}
}
// 分类
.scroll-container {
box-sizing: border-box;
white-space: nowrap;
width: 540upx;
margin: auto;
.scroll-item {
width: 152upx;
height: 248upx;
background: #F5F5F5;
border-radius: 20upx;
text-align: center;
display: inline-block;
margin: 0 10upx;
border: 4upx solid #F5F5F5;
&.active {
background: #FFFFFF !important;
border: 4upx solid #864BC3;
}
// &.active::before {
// content: '...';
// position: absolute;
// left: calc(50% - 10px);
// top: 100%;
// width: 20px;
// margin-left: 0px;
// margin-top: -5px;
// border-top: 4px dotted #595959;
// }
}
}
.experiencebutton {
width: 230upx;
height: 70upx;
line-height: 70upx;
text-align: center;
color: #FFFFFF;
margin: 40upx auto 0;
border-radius: 35upx;
background: linear-gradient(to right, #834DC4, #1983D7);
font-size: 26upx;
}
.canbutton {
color: #FFFFFF;
font-size: 26upx;
width: 218upx;
height: 58upx;
line-height: 58upx;
border: 1px transparent solid;
border-radius: 30px;
position: relative;
margin: auto;
background: #292933;
text-align: center;
}
.canbutton:after {
content: '';
position: absolute;
top: -3px;
bottom: -3px;
left: -3px;
right: -3px;
background: linear-gradient(to right, #834DC4, #1983D7);
border-radius: 30px;
content: '';
z-index: -1;
}
// 品牌
.brandactive {
background: #E4D0F6 !important;
}
.backgroundColoractive {
border: 2upx #834DC4 solid !important;
}
.tooltiptext {
visibility: hidden;
min-width: 120upx;
background-color: black;
color: #fff;
text-align: center;
border-radius: 6upx;
padding: 5upx 0;
font-size: 20upx;
/* 定位 */
position: fixed;
z-index: 1;
}
.tooltiptextactive {
visibility: visible;
}
// 型号
.model {
padding: 0upx 20upx;
height: 60upx;
line-height: 60upx;
background: #141319;
text-align: center;
color: #FFFFFF;
border-radius: 30upx;
margin-right: 20upx;
font-size: 28upx;
}
.modelactive {
color: #553177 !important;
}
.determineBut {
background: linear-gradient(92deg, #178CE6, #984ACE);
color: #FFFFFF;
position: fixed;
bottom: 110upx;
text-align: center;
left: 0;
right: 0;
width: 251upx;
height: 77upx;
line-height: 77upx;
border-radius: 38upx;
font-size: 31upx;
margin: auto;
}
.determineButtn {
width: 251upx;
margin: 34upx auto 0;
height: 77upx;
line-height: 77upx;
text-align: center;
background: linear-gradient(92deg, #178CE6, #984ACE);
opacity: 0.86;
border-radius: 38upx;
font-size: 31upx;
font-weight: 500;
color: #FFFFFF;
}
</style>
pages/mall/lineUp.vue
......@@ -18,23 +18,21 @@
<view style="color: #fff; display: flex; align-items: center;">
<view v-if="designer.user_id != userId"
style="margin:10upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; opacity: 0.2;">
<!-- <image style="width: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 1;"/> --> <image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png"
mode="aspectFit"></imag
:src="designer.front_image_old" mode="aspectFit"></image>
<!-- <image style="width: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0;margin:auto; z-index: 1;"/> -->
<image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png" mode="aspectFit">
</imag :src="designer.front_image_old" mode="aspectFit">
</image>
<image style="width: 70upx; height: 70upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit"></image>
margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit"></image>
<!-- <image style="width: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 3;" :src="designer.front_image" mode="aspectFit"></image> -->
</view>
<view v-if="designer.user_id == userId"
style="margin:10upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; ">
<!-- <image style="width: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 1;"/> --><image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png"
margin:auto; z-index: 1;"/> -->
<image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png"
mode="aspectFit"></image>
:src="designer.front_image_old" mode="aspectFit"></image>
<image style="width: 70upx; height: 70upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
......@@ -44,7 +42,6 @@
margin:auto; z-index: 3;" :src="designer.front_image" mode="aspectFit"></image> -->
</view>
<view style="width: calc(100% - 360upx);">
<view style="width: 90%;font-size: 28upx;">
<text style="font-size: 40upx;font-weight: bold;">{{designer.id || ''}}</text>
......@@ -57,7 +54,7 @@
</view>
<view style="font-size: 24upx; color:#666666; margin-top: 30upx;">{{designer.create_time || ''}}</view> -->
</view>
<view v-if="designer.status.value == 1"
<view v-if="designer.status.value == 1"
style="width: 136upx; height: 60upx;background: linear-gradient(92deg, #178CE6, #984ACE);opacity: 0.86;border-radius: 30upx; margin-top: 70upx;">
<view style="text-align: center; font-size: 26upx; color: #FFFFFF; line-height: 60upx;"> 打印中
</view>
......@@ -67,7 +64,6 @@
</view>
</view>
</view>
</view>
</view>
<!-- 提示 -->
......@@ -81,9 +77,23 @@
<view style="position: absolute;
top: 0; right: 0;" @click="sighstate = false">
<image src="../../static/icon_guanbi.png" mode=""
style="width: 26upx; height: 26upx; padding: 12upx 22upx;"></image>
style="width: 26upx; height: 26upx; padding: 12upx 22upx;"></image>
</view>
<view style="width: 558upx;">
<view v-if=" designer.goods_name == '背包' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_80'"
mode="aspectFit" style="width:80upx; margin-left: 100upx;"></image>
<image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view>
<!-- goods_name=马卡龙 -->
<view v-if=" designer.goods_name == '马卡龙' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 500upx; height: 350upx; position: relative; margin: auto;">
<view style="width: 100%; height: 100%; display: flex; border: 1px solid #09BB07;">
......@@ -103,10 +113,39 @@
</view>
</view>
</view>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view>
<view v-if=" designer.goods_name == '单肩袋' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_140'"
mode="aspectFit" style="width:140upx; margin-left: 100upx;"></image>
<image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_290'"
mode="aspectFit" style=" width: 300upx;margin-left: -220upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view>
<view
v-if=" designer.goods_name != '背包' && designer.goods_name != '马卡龙' && designer.goods_name != '单肩袋' "
style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_100'"
mode="aspectFit" style="width:100upx; margin-left: 100upx;"></image>
<image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_290'"
mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view>
</view>
</view>
......@@ -228,7 +267,7 @@
},
// 做滚动加载使用
loadMore() {
console.log('滚动加载')
//console.log('滚动加载')
// if (Math.ceil(this.queryPage.total / this.queryPage.per_page) < this.queryPage.page) {
// return setTimeout(() => {
// uni.showToast({
......@@ -263,27 +302,9 @@
icon: 'none'
});
}, 500);
// if (this.LoupanList.length < 15) {
// return setTimeout(() => {
// uni.showToast({
// title: '啊嘞,没有更多数据了！',
// icon: 'none'
// });
// }, 500);
// }else{
// if (Math.ceil(this.queryPage.total / this.queryPage.per_page) < this.queryPage.page) {
// return setTimeout(() => {
// uni.showToast({
// title: '啊嘞,没有更多数据了！',
// icon: 'none'
// });
// }, 500);
// }
// }
// this.queryPage.page = this.queryPage.page + 1;
// this.loadGoodsList(Enums.DATA_DIRECTION.DOWN);
},
onLoad(options) {
//console.log("options.machine_id="+options.machine_id);
this.queryPage.machine_id = options.machine_id;
this.key = options.key || 2;
this.LoupanList = []
......@@ -306,6 +327,22 @@
// 卸载程序
onUnload() {
this.clearIntervalTime()
let pages = getCurrentPages();
//console.log(pages[pages.length - 2].route)
if (pages[pages.length - 2].route == "pages/mine/order") {
uni.reLaunch({
url: '../index/machineDetail?machine_id=' + this.queryPage.machine_id + '&worksid=1'
})
} else if (pages[pages.length - 2].route == "pages/mine/orderNew") {
uni.reLaunch({
url: '../index/machineDetail?machine_id=' + this.queryPage.machine_id + '&worksid=1'
})
} else if (pages[pages.length - 2].route == "pages/index/index") {
uni.reLaunch({
url: '../index/machineDetail?machine_id=' + this.queryPage.machine_id + '&worksid=1'
})
}
}
};
</script>
......
pages/mine/self_help_payment_details.vue
......@@ -159,7 +159,7 @@
</view>
</view>
</view>
<!-- 高尔夫球图 -->
<!-- 色彩公园Lite球图 -->
<view v-if="initstate" :style="{'z-index': data.render_cove_width ? 6:0}"
style="display: flex; align-items: center; justify-content: center;
position: absolute; width: 100%; height: 100%; left: 0; top: 0;
......@@ -269,7 +269,7 @@
</view>
</view>
</view>
<!-- 高尔夫球图 -->
<!-- 色彩公园Lite球图 -->
<view v-if="initstate" :style="{'z-index': data.render_cove_width ? 5:0}"
style="display: flex; align-items: center; justify-content: center;
position: absolute; width: 100%; height: 100%; left: 0; top: 0;
......
service/UserService.js
......@@ -63,6 +63,6 @@ export default service
// 接口解读
/**
* 登录接口
* url:'/golf/index'
* url:'/lite/index'
* query：{s: 'Init.init',code: ,nickname: ,gender:,portrait: ,encryptedData:,iv:,promoter_id:machine_id:}
*/
\ No newline at end of file
service/homeservice.js
......@@ -43,7 +43,7 @@ const service = {
export default service
/**
* url:/golf/index
* url:/lite/index
*
* 获取附件店铺
* query：{s: 'Machine.shopList',longitude: ,latitude: ,distance:}
......
static/icon/icon_refresh.png
static/icon/icon_refresh.png

2.12 KB | W: | H:

static/icon/icon_refresh.png

971 Bytes | W: | H:

static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png

4.34 KB | W: | H:

static/icon/icon_refresh_red.png

1.49 KB | W: | H:

static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_confirm.png
static/icon_confirm.png

2.19 KB | W: | H:

static/icon_confirm.png

486 Bytes | W: | H:

static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
  • 2-up
  • Swipe
  • Onion skin
util/Env.js
......@@ -18,10 +18,10 @@ console.log(accountInfo.miniProgram.envVersion)
const Env = {
getDevBaseURL: () => baseURL,
getBaseURL: () => baseURL,
getmachineId: () => '100036', //线上100086 //测试 100036' //100086
getappcode: () => 'golf',
getmachineId: () => '100054', //线上100086 //测试 422001' //100086
getappcode: () => 'lite',
getmalltext: () => "色彩公园Lite",
getAppID: () => "wx90d72bea4d5222b6",
getAppID: () => "wx1c777ee874c39b0b",
getcompany: () => "深圳市瑞丰彩科技有限公司"
}
export default Env
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment