Skip to content

W
wechat_currency
Commit f527b017 by huahua
Options

修改

parent 6e804f35
Showing with 594 additions and 251 deletions
api/UserApi.js
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
* 登录 * 登录
* @param {*} params * @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 { ...@@ -8,8 +8,8 @@ import {
* *
* @param {*} params * @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}) export const newroute = (params = {}) => _request({url: '/lite/index/index', params, method: 'post',token: true})
\ No newline at end of file \ No newline at end of file
manifest.json
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"devServer" : { "devServer" : {
"port" : 8088 "port" : 8088
}, },
"title" : "色彩公园Lite", "title" : "色彩高尔夫",
"router" : { "router" : {
"base" : "" "base" : ""
}, },
......
pages.json
{ {
"pages": [{ "pages": [
/* {
"path": "pages/index/mall", "path": "pages/index/mall",
"style": { "style": {
"navigationBarTitleText": "色彩公园Lite", "navigationBarTitleText": "色彩高尔夫",
// "navigationStyle":"custom",//禁用uni-app默认的头部导航
"enablePullDownRefresh": true
}
}, */
/* {
"path": "pages/index/machineDetail",
"style": {
"navigationBarTitleText": "色彩高尔夫",
// "navigationStyle":"custom",//禁用uni-app默认的头部导航 // "navigationStyle":"custom",//禁用uni-app默认的头部导航
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
} */
{
"path": "pages/index/machineDetail",
"style": {
"navigationBarTitleText": "高尔夫定制",
"navigationStyle": "custom" //禁用uni-app默认的头部导航
}
}, },
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
...@@ -15,6 +34,7 @@ ...@@ -15,6 +34,7 @@
} }
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "#ffffff", "navigationBarTextStyle": "#ffffff",
...@@ -27,20 +47,21 @@ ...@@ -27,20 +47,21 @@
"pages": [{ "pages": [{
"path": "login", "path": "login",
"style": { "style": {
"navigationBarTitleText": "色彩公园Lite" "navigationBarTitleText": "色彩高尔夫"
} }
}] }]
}, },
{ {
"root": "pages/mall", "root": "pages/mall",
"pages": [{ "pages": [
/* {
"path": "machineDetail", "path": "machineDetail",
"style": { "style": {
"navigationBarTitleText": "色彩站详情", "navigationBarTitleText": "色彩站详情",
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, }, */
{ {
"path": "lineUp", "path": "lineUp",
"style": { "style": {
......
pages/index/css/main.css
...@@ -47,11 +47,13 @@ ...@@ -47,11 +47,13 @@
bottom: 22upx; bottom: 22upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
/* padding-left: 10upx; */
} }
.dots .dot { .dots .dot {
color: #F56364; color: #F56364;
font-size: 22upx; font-size: 22upx;
margin-left: 10upx;
} }
/*弹性布局*/ /*弹性布局*/
.flex { .flex {
......
pages/index/head/head.vue
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
}, },
created() { created() {
console.log('设备信息')
//设备信息 //设备信息
let app = uni.getSystemInfoSync(); let app = uni.getSystemInfoSync();
//胶囊信息 //胶囊信息
...@@ -58,7 +57,6 @@ ...@@ -58,7 +57,6 @@
}, },
methods: { methods: {
back(){ back(){
console.log('点击头部返回')
uni.navigateBack(); uni.navigateBack();
} }
}, },
......
pages/index/index.vue
...@@ -13,22 +13,35 @@ ...@@ -13,22 +13,35 @@
<kps-image-cutter @ok="onok" @cancel="oncancle" ref="index" :properties="properties"></kps-image-cutter> <kps-image-cutter @ok="onok" @cancel="oncancle" ref="index" :properties="properties"></kps-image-cutter>
</view> </view>
<!-- 设计区域 --> <!-- 设计区域 -->
<view v-show="!state" class="full-width content-color full-height" :style="{background: design_color }"> <view v-show="!state" class="full-width content-color full-height" :style="{background: design_color }" >
<!-- 取消选中 --> <!-- 取消选中 -->
<view class="full-width full-height" style="position: absolute; top: 0; left: 0;" @click.stop="itemCancel"> <view class="full-width full-height" style="position: absolute; top: 0; left: 0;" @click.stop="itemCancel">
</view> </view>
<view class="container" :style="{height: data.windowHeight +'px'}" @click='itemCancel' <view class="container" :style="{height: data.windowHeight +'px'}" @click='itemCancel'
@touchmove.stop="touchMove" @touchend.stop="touchEnd"> @touchmove.stop="touchMove" @touchend.stop="touchEnd" >
<view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px'}" style="position: relative;">
<!-- style=" display:flex;
justify-content:center;" -->
<!-- margin-top: 100upx; -->
<view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px' }" style="position: relative; " >
<!-- 底图 --> <!-- 底图 -->
<image :src="data.bgImage_old" mode="widthFix" <image :src="data.bgImage_old" mode="widthFix"
:style="{width: data.bgWidth +'px',height: data.bgWidth +'px'}" :style="{width: data.bgWidth +'px',height: data.bgWidth +'px'}"
style="position: absolute; z-index: 0; top: 0; bottom: 0; margin: auto;"></image> style="position: absolute; z-index: 0; top: 0; bottom: 0; margin: auto; "></image>
<!-- 底色 --> <!-- 底色 -->
<view :style="{width: data.editorWidth * 1.1 +'px',height: data.editorHeight * 1.1 +'px', <!-- <view :style="{width: data.editorWidth * 1.1 +'px',height: data.editorHeight * 1.1 +'px',
background:background_color ? background_color : ''}"
style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto;z-index: 1;">
</view> -->
<!-- 底色 -->
<view :style="{width: data.editorWidth + 'px',height: data.editorHeight +'px',
background:background_color ? background_color : ''}" background:background_color ? background_color : ''}"
style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto;z-index: 1;"> style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto;z-index: 1;">
</view> </view>
<!-- 遮罩图 --> <!-- 遮罩图 -->
<image :src="data.bgImage" mode="widthFix" <image :src="data.bgImage" mode="widthFix"
:style="{width: data.bgWidth +'px',height: data.bgWidth +'px'}" :style="{width: data.bgWidth +'px',height: data.bgWidth +'px'}"
...@@ -110,8 +123,11 @@ ...@@ -110,8 +123,11 @@
class='left_edge-wrap' :data-id='item.id' class='left_edge-wrap' :data-id='item.id'
@touchstart.stop="edgeStart($event, 'left')" @touchstart.stop="edgeStart($event, 'left')"
@touchend.stop.prevent='edgeEnd'> @touchend.stop.prevent='edgeEnd'>
<view class='left_edge' <!-- :style="{background: item.typetext =='left' ? '#F56364' : '#5CE6B5'}" -->
:style="{background: item.typetext =='left' ? '#F56364' : '#5CE6B5'}"> <view class='left_edge'>
<image src="../../static/icon/icon_sticker_left_tailoring.png"
mode="aspectFill" style="width: 40upx; height: 55upx;margin: auto">
</image>
</view> </view>
</view> </view>
<view v-if="item.activeedge" <view v-if="item.activeedge"
...@@ -119,8 +135,11 @@ ...@@ -119,8 +135,11 @@
class='topedge-wrap' :data-id='item.id' class='topedge-wrap' :data-id='item.id'
@touchstart.stop="edgeStart($event, 'top')" @touchstart.stop="edgeStart($event, 'top')"
@touchend.stop.prevent='edgeEnd'> @touchend.stop.prevent='edgeEnd'>
<view class='topedge' <!-- :style="{background: item.typetext =='top' ? '#F56364' : '#5CE6B5'}" -->
:style="{background: item.typetext =='top' ? '#F56364' : '#5CE6B5'}"> <view class='topedge'>
<image src="../../static/icon/icon_sticker_top_tailoring.png"
mode="aspectFill" style="width: 50upx; height: 37upx; margin: auto">
</image>
</view> </view>
</view> </view>
<view v-if="item.activeedge" <view v-if="item.activeedge"
...@@ -128,8 +147,11 @@ ...@@ -128,8 +147,11 @@
class='rightedge-wrap' :data-id='item.id' class='rightedge-wrap' :data-id='item.id'
@touchstart.stop="edgeStart($event, 'right')" @touchstart.stop="edgeStart($event, 'right')"
@touchend.stop.prevent='edgeEnd'> @touchend.stop.prevent='edgeEnd'>
<view class='rightedge' <!-- :style="{background: item.typetext =='right' ? '#F56364' : '#5CE6B5'}" -->
:style="{background: item.typetext =='right' ? '#F56364' : '#5CE6B5'}"> <view class='rightedge'>
<image src="../../static/icon/icon_sticker_right_tailoring.png"
mode="aspectFill" style="width: 40upx; height: 55upx;margin: auto">
</image>
</view> </view>
</view> </view>
<view v-if="item.activeedge" <view v-if="item.activeedge"
...@@ -137,8 +159,11 @@ ...@@ -137,8 +159,11 @@
class='bottomedge-wrap' :data-id='item.id' class='bottomedge-wrap' :data-id='item.id'
@touchstart.stop="edgeStart($event, 'bottom')" @touchstart.stop="edgeStart($event, 'bottom')"
@touchend.stop.prevent='edgeEnd'> @touchend.stop.prevent='edgeEnd'>
<view class='bottomedge' <!-- :style="{background: item.typetext =='bottom' ? '#F56364' : '#5CE6B5'}" -->
:style="{background: item.typetext =='bottom' ? '#F56364' : '#5CE6B5'}"> <view class='bottomedge'>
<image src="../../static/icon/icon_sticker_buttom_tailoring.png"
mode="aspectFill" style="width: 50upx; height: 37upx; margin: auto">
</image>
</view> </view>
</view> </view>
</view> </view>
...@@ -356,11 +381,11 @@ ...@@ -356,11 +381,11 @@
</view> </view>
<view style="text-align: center; color: #FFFFFF; position: fixed; z-index: 99; <!-- <view style="text-align: center; color: #FFFFFF; position: fixed; z-index: 99;
left: 0; right: 0; bottom: 227upx;"> left: 0; right: 0; bottom: 227upx;">
<view>打印时，自动生成 4 x 3 排版</view> <view>打印时，自动生成 4 x 3 排版</view>
<text style="color: #0CA457; padding: 20upx;" @click="drawImg">预览></text> <text style="color: #0CA457; padding: 20upx;" @click="drawImg">预览></text>
</view> </view> -->
<!-- 预览 --> <!-- 预览 -->
<view v-if="showtwo"> <view v-if="showtwo">
<view <view
...@@ -2155,7 +2180,7 @@ ...@@ -2155,7 +2180,7 @@
showPopup(e) { //打开弹框 1模板 2贴图 3字体 showPopup(e) { //打开弹框 1模板 2贴图 3字体
//this.queryPage.material_series_id = 0 //this.queryPage.material_series_id = 0
//this.material_series_currentId = 0 //this.material_series_currentId = 0
//console.log("good_id="+this.data.goods_id)
this.delete_wrap_state = false this.delete_wrap_state = false
this.showone = false this.showone = false
this.e_active = e this.e_active = e
...@@ -2189,7 +2214,8 @@ ...@@ -2189,7 +2214,8 @@
} else if (e == 2) { //贴图 } else if (e == 2) { //贴图
this.backgroundColor = false this.backgroundColor = false
this.Adlists = this.diy_bannerList this.Adlists = this.diy_bannerList
this.queryPage.goods_id = null //this.queryPage.goods_id = this.data.goods_id
this.queryPage.goods_id = null;
this.brands = this.Material_category this.brands = this.Material_category
this.currentId = this.currentId_Material; this.currentId = this.currentId_Material;
this.currentIndex = this.currentIndex_Material; this.currentIndex = this.currentIndex_Material;
...@@ -3291,97 +3317,8 @@ ...@@ -3291,97 +3317,8 @@
}); });
} }
}, },
/* 下一层 */
// lowerIndex: function() { //设置数据
// // 当前选中的部件
// var currentItem = items[index];
// if (currentItem.index <= 0) {
// wx.showToast({title: '已经到达最底层',icon: 'success',duration: 2000});
// } else {
// if(currentItem.is_under == 1){
// // 循环当前的组件数据
// for (var item of items) {
// if (item.index == currentItem.index - 1) {
// item.index = item.index + 1;
// currentItem.index = currentItem.index - 1;
// this.data.itemList = items
// // this.setData({itemList:items});
// this.saveSnapshot();
// break;
// }
// }
// }else{
// let number_index = 0
// for (var item of items) {
// if (item.is_under == 1){
// number_index++
// }
// }
// if (currentItem.index <= number_index) {
// wx.showToast({title: '已经到达最底层',icon: 'success',duration: 2000});
// } else {
// // 循环当前的组件数据
// for (var item of items) {
// if (item.index == currentItem.index - 1) {
// item.index = item.index + 1;
// currentItem.index = currentItem.index - 1;
// this.data.itemList = items
// // this.setData({itemList:items});
// this.saveSnapshot();
// break;
// }
// }
// }
// }
// }
// },
/* 上一层 */
// upperIndex: function() {
// // 当前选中的部件
// var currentItem = items[index];
// if (currentItem.index >= items.length - 1) {
// wx.showToast({
// title: '已经到达最顶层',
// icon: 'success',
// duration: 2000
// });
// } else {
// if(currentItem.is_under == 1){
// let number_index = 0
// for (var item of items) {
// if (item.is_under == 1){
// number_index++
// }
// }
// if (currentItem.index >= number_index - 1) {
// wx.showToast({title: '已经到达最顶层',icon: 'success',duration: 2000});
// } else {
// // 循环当前的组件数据
// for (var item of items) {
// if (item.index == currentItem.index + 1) {
// item.index = item.index - 1;
// currentItem.index = currentItem.index + 1;
// this.data.itemList = items
// this.saveSnapshot();
// break;
// }
// }
// }
// }else{
// // 循环当前的组件数据
// for (var item of items) {
// if (item.index == currentItem.index + 1) {
// item.index = item.index - 1;
// currentItem.index = currentItem.index + 1;
// this.data.itemList = items
// // this.setData({itemList:items});
// this.saveSnapshot();
// break;
// }
// }
// }
// }
// },
setData(obj) { setData(obj) {
let that = this; let that = this;
let keys = []; let keys = [];
...@@ -3402,17 +3339,18 @@ ...@@ -3402,17 +3339,18 @@
}) })
}); });
}, },
// 获取产品详情数据 // 获取产品详情数据
goodslist() { goodslist() {
this.front_image_long = false this.front_image_long = false
// homeservice.queryList({ homeservice.queryList({
// s: 'Product.detail', s: 'Product.detail',
// id: this.data.goods_id id: this.data.goods_id
// }).then(result => {
homeservice.newqueryList({
s: 'Product.getCommonGoods'
}).then(result => { }).then(result => {
this.data.goods_id = result.id // 商品id /* homeservice.newqueryList({
s: 'Product.getDat'
}).then(result => { */
//this.data.goods_id = result.id // 商品id
// this.queryPage.goods_category_id = result.goods_category_id //星形接口列表增加，产品分类参数 // this.queryPage.goods_category_id = result.goods_category_id //星形接口列表增加，产品分类参数
// 读取背景图 // 读取背景图
uni.getImageInfo({ uni.getImageInfo({
...@@ -3473,13 +3411,7 @@ ...@@ -3473,13 +3411,7 @@
icon_click: "../../static/image/icon_new_pressed.png", icon_click: "../../static/image/icon_new_pressed.png",
title: "最新" title: "最新"
}, },
// {icon: "../../static/image/icon_hot_default.png",icon_click: "../../static/image/icon_hot_pressed.png",title: "热门"},
) )
/* this.Material_category.push({
icon: "../../static/image/my.png",
icon_click: "../../static/image/my-o.png",
title: "我的"
}) */
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.msg, title: err.msg,
...@@ -3506,9 +3438,11 @@ ...@@ -3506,9 +3438,11 @@
// machine_id=100036&key=2 // machine_id=100036&key=2
// console.log(options) // console.log(options)
items = [] items = []
this.data.goods_id = options.good_id;
console.log("this.data.goods_id="+options.good_id)
let that = this; let that = this;
wx.createSelectorQuery().select('.delete-wrap').boundingClientRect(function(rect) { wx.createSelectorQuery().select('.delete-wrap').boundingClientRect(function(rect) {
// console.log(rect)
that.setData({ that.setData({
deleteTop: rect.top, deleteTop: rect.top,
}) })
...@@ -3607,7 +3541,7 @@ ...@@ -3607,7 +3541,7 @@
} }
} }
}) })
// 获取屏幕宽高 //获取屏幕宽高
wx.getSystemInfo({ wx.getSystemInfo({
success: function(res) { success: function(res) {
let pixelRate = res.windowWidth / 750 let pixelRate = res.windowWidth / 750
...@@ -3616,14 +3550,14 @@ ...@@ -3616,14 +3550,14 @@
that.data.bgWidth = res.windowWidth // 画布宽度 that.data.bgWidth = res.windowWidth // 画布宽度
that.data.bgHeight = res.windowHeight * (861 / 1196) // 画布高度 高度比率 * (861 / 1196) that.data.bgHeight = res.windowHeight * (861 / 1196) // 画布高度 高度比率 * (861 / 1196)
that.data.pixelRate = pixelRate // 屏幕宽度比率 that.data.pixelRate = pixelRate // 屏幕宽度比率
// if (options.machine_id != undefined) { // 判断是从设备进来 //if(options.machine_id != undefined) { // 判断是从设备进来
that.machine_id = options.machine_id || null // 设备id that.machine_id = options.machine_id || null // 设备id
that.queryPage.machine_id = options.machine_id || null // 设备id that.queryPage.machine_id = options.machine_id || null // 设备id
that.data.goods_id = 100 // 商品id //that.data.goods_id = 100 // 商品id
that.key = 2 that.key = 2
that.titlename = '高尔夫定制' //修改头部名称 that.titlename = '色彩公园Lite定制' //修改头部名称
that.goodslist() // 获取产品详情数据 that.goodslist() // 获取产品详情数据
// } //}
that.category() // 作品分类 贴图分类 that.category() // 作品分类 贴图分类
} }
}) })
...@@ -3871,10 +3805,10 @@ ...@@ -3871,10 +3805,10 @@
.left_edge { .left_edge {
position: absolute; position: absolute;
z-index: 99; z-index: 99;
left: 24upx; left: 4upx;
width: 6upx; /* width: 6upx; */
height: 40upx; height: 40upx;
background: #5CE6B5; /* background: #5CE6B5; */
top: calc(50% - 20upx); top: calc(50% - 20upx);
} }
...@@ -3904,10 +3838,10 @@ ...@@ -3904,10 +3838,10 @@
.rightedge { .rightedge {
position: absolute; position: absolute;
z-index: 99; z-index: 99;
right: 24upx; right: 4upx;
width: 6upx; /* width: 6upx; */
height: 40upx; height: 40upx;
background: #5CE6B5; /* background: #5CE6B5; */
top: calc(50% - 20upx); top: calc(50% - 20upx);
} }
...@@ -3926,10 +3860,10 @@ ...@@ -3926,10 +3860,10 @@
.topedge { .topedge {
position: absolute; position: absolute;
z-index: 99; z-index: 99;
top: 24upx; top: 4upx;
width: 40upx; width: 40upx;
height: 6upx; /* height: 6upx;
background: #5CE6B5; background: #5CE6B5; */
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
...@@ -3950,10 +3884,10 @@ ...@@ -3950,10 +3884,10 @@
.bottomedge { .bottomedge {
position: absolute; position: absolute;
z-index: 99; z-index: 99;
bottom: 24upx; bottom: 4upx;
width: 40upx; width: 40upx;
height: 6upx; /* height: 6upx;
background: #5CE6B5; background: #5CE6B5; */
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
......
pages/mall/machineDetail.vue → pages/index/machineDetail.vue
<template> <template>
<view class="full-width full-height"> <view class="full-width full-height">
<!-- 自定义头部 --> <!-- 自定义头部 -->
<myhead :worksid="worksid" :title="myheadtext" :color="'#fff'" :titleShow="true" :backShow="true" :background="'none'"></myhead> <myhead :worksid="worksid" :title="myheadtext" :color="'#fff'" :titleShow="true" :backShow="false"
:background="'none'"></myhead>
<view style="position: relative;width: 100%; height: 100%; z-index: 2;"> <view style="position: relative;width: 100%; height: 100%; z-index: 2;">
<!-- 轮播图 --> <!-- 轮播图 -->
<view v-if="statusloading == 1" class='swiper-box' style="width: 100%; height: 100%;"> <view v-if="statusloading == 1" class='swiper-box' style="width: 100%; height: 100%;">
<swiper :autoplay="true" :interval="3000" :duration="1000" @change="swiperChange" class="swiper full-width" <swiper :autoplay="true" :interval="3000" :duration="1000" @change="swiperChange"
style="width: 100%; height: 100%; border-radius: 0;"> class="swiper full-width" style="width: 100%; height: 100%; border-radius: 0;">
<swiper-item v-for="(item, index) in Adlists" :key="index" class="swiper-item full-width"> <swiper-item v-for="(item, index) in Adlists" :key="index" class="swiper-item full-width">
<image style="width: 100%; height: 100%; margin: auto; display: block;" <image style="width: 100%; height: 100%; margin: auto; display: block;"
:src="item.content + '?x-oss-process=image/resize,lfit,w_750'" mode="aspectFill"></image> :src="item.content + '?x-oss-process=image/resize,lfit,w_750'" mode="aspectFill"></image>
...@@ -17,7 +18,9 @@ ...@@ -17,7 +18,9 @@
<view style="position: fixed; bottom: 232upx; text-align: center;left: 0; right: 0;"> <view style="position: fixed; bottom: 232upx; text-align: center;left: 0; right: 0;">
<view class="dots"> <view class="dots">
<view v-for="(item, index) in Adlists" class="dot-wrapper" :key="index"> <view v-for="(item, index) in Adlists" class="dot-wrapper" :key="index">
<view class="dot iconfont" :class="[index == currentSwiper ? 'iconsanjiaoxing':'iconxingzhuang-sanjiaoxing' ]"></view> <view class="dot iconfont"
:class="[index == currentSwiper ? 'iconsanjiaoxing':'iconxingzhuang-sanjiaoxing' ]">
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -29,11 +32,12 @@ ...@@ -29,11 +32,12 @@
position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: -1;"></image> position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: -1;"></image>
<view style="color: #43cf7c; text-align: center; line-height: 200upx;font-size: 30upx; font-weight: bold;">开始定制</view> <view style="color: #43cf7c; text-align: center; line-height: 200upx;font-size: 30upx; font-weight: bold;">开始定制</view>
</view> --> </view> -->
<view @click="Customize_now" hover-class="hover-class-bg" <view @click="Customize_now" hover-class="hover-class-bg" style="position: fixed; bottom: 160upx; left: 0; right: 0; margin: auto;
style="position: fixed; bottom: 160upx; left: 0; right: 0; margin: auto;
width: 300upx; height: 100upx; background: linear-gradient(92deg, #5CE6B5, #0CA457); width: 300upx; height: 100upx; background: linear-gradient(92deg, #5CE6B5, #0CA457);
box-shadow: 0upx 19upx 48upx 1upx rgba(20, 31, 62, 0.86); border-radius: 50upx;"> box-shadow: 0upx 19upx 48upx 1upx rgba(20, 31, 62, 0.86); border-radius: 50upx;">
<view style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">开始定制</view> <view
style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">
开始定制</view>
</view> </view>
</view> </view>
<!-- 错误提示信息 --> <!-- 错误提示信息 -->
...@@ -44,14 +48,18 @@ ...@@ -44,14 +48,18 @@
<view @click="tomakePhoneCall"> <view @click="tomakePhoneCall">
<view class="start_text">联系客服</view> <view class="start_text">联系客服</view>
<view class="start_text" style="display: flex; justify-content: center; align-items: center;"> <view class="start_text" style="display: flex; justify-content: center; align-items: center;">
<image src="../../static/phone.png" mode="" style="width: 32upx; height: 32upx; margin-right: 5upx;"></image> <image src="../../static/phone.png" mode=""
style="width: 32upx; height: 32upx; margin-right: 5upx;"></image>
{{phone || '18938664545'}} {{phone || '18938664545'}}
</view> </view>
</view> </view>
</view> </view>
<image src="../../static/logo.jpg" mode="aspectFill" style="width: 664upx; height: 757upx; opacity: 0.03; position: absolute; left: 0; bottom: 0; z-index: -1;"></image> <image src="../../static/logo.jpg" mode="aspectFill"
style="width: 664upx; height: 757upx; opacity: 0.03; position: absolute; left: 0; bottom: 0; z-index: -1;">
</image>
</view> </view>
<view v-if="statusloading == 2" style="margin-top: -50upx;text-align: center;color: #888888; font-weight: 400; line-height: 40upx;"> <view v-if="statusloading == 2"
style="margin-top: -50upx;text-align: center;color: #888888; font-weight: 400; line-height: 40upx;">
<text style="font-size: 22upx;">深圳市瑞丰彩科技有限公司</text> <text style="font-size: 22upx;">深圳市瑞丰彩科技有限公司</text>
</view> </view>
</view> </view>
...@@ -66,12 +74,17 @@ ...@@ -66,12 +74,17 @@
<view>信息</view> <view>信息</view>
</view> </view>
</view> --> </view> -->
<view v-if="statusloading == 1" @tap="game" <view v-if="statusloading == 1" @tap="toLineList"
style="position: fixed; z-index: 99; right: 0; bottom: 318upx; width: 109upx; height: 123upx;"> style="position: fixed; z-index: 99; right: 0; bottom: 318upx; width: 109upx; height: 123upx;">
<image src="../../static/liebiao.png" mode="" <image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
style="width: 243upx; height: 123upx;"></image>
</view> </view>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods> <!-- //商品弹框 -->
</view> </view>
</template> </template>
<script> <script>
...@@ -80,54 +93,73 @@ ...@@ -80,54 +93,73 @@
import FrImage from '@/components/fr-image/fr-image.vue' import FrImage from '@/components/fr-image/fr-image.vue'
import Signin from '../index/Signin.vue'; import Signin from '../index/Signin.vue';
import myhead from './head/head.vue'; import myhead from './head/head.vue';
/*import uniPopup from './/common/uni-popup/uni-popup.vue' */
import switchGoods from '../index/switchGoods.vue'; // 手机壳
export default { export default {
components: { components: {
myhead, myhead,
Signin, Signin,
FrImage FrImage,
switchGoods,
}, },
computed: {}, computed: {},
data() { data() {
return { return {
Adlists: [{},{}], Adlists: [{}, {}],
currentSwiper:0, currentSwiper: 0,
machine_id:null, machine_id: null,
key:2,//1直营配送站 2 万能通用版 3色彩自助站 key: 2, //1直营配送站 2 万能通用版 3色彩自助站
list:null, list: null,
myheadtext:'打印', myheadtext: '定制',
msg:null, msg: null,
worksid:1, worksid: 1,
statusloading:null,//加载状态 statusloading: null, //加载状态
phone:'18938664545', phone: '18938664545',
}; };
}, },
methods: { methods: {
game(){
//去排队列表
toLineList() {
if (!this.$AppContext.checkLogin()) {
this.tologo()
} else {
uni.navigateTo({ uni.navigateTo({
url: '../mall/lineUp?machine_id=' + this.machine_id + '&key=' + this.key url: '../mall/lineUp?machine_id=' + this.machine_id + '&key=' + this.key
}) })
}
},
//选择商品进来
selectGoodItem(item) {
uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id + " &good_id=" + item.id,
})
}, },
// 立即定制 // 立即定制
Customize_now(){ Customize_now() {
if (!this.$AppContext.checkLogin()) { if (!this.$AppContext.checkLogin()) {
this.tologo() this.tologo()
} else { } else {
if(this.list != null){ this.$nextTick(() => {
if(this.list.status.value == 1 || this.list.status.value == 2){ this.$refs['switchGoods'].open({
uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id, });
}) })
}else{
uni.showToast({title: '设备休息中',icon:'none',duration: 2000});
}
}else{
uni.showToast({title: this.msg,icon:'none',duration: 2000});
}
} }
}, },
// 打电话 // 打电话
tomakePhoneCall(){ tomakePhoneCall() {
uni.showLoading({title: '跳转中...',mask: true}) uni.showLoading({
title: '跳转中...',
mask: true
})
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: this.phone || '18938664545', //仅为示例 phoneNumber: this.phone || '18938664545', //仅为示例
success(res) { success(res) {
...@@ -135,11 +167,15 @@ ...@@ -135,11 +167,15 @@
}, },
fail(err) { fail(err) {
uni.hideLoading(); uni.hideLoading();
uni.showToast({title: '拨打的电话失败',icon:'none',duration: 2000}); uni.showToast({
title: '拨打的电话失败',
icon: 'none',
duration: 2000
});
} }
}); });
}, },
tologo(){ tologo() {
// 先登陆 // 先登陆
let that = this; let that = this;
uni.login({ uni.login({
...@@ -156,7 +192,10 @@ ...@@ -156,7 +192,10 @@
}); });
}, },
fail: (res) => { fail: (res) => {
uni.showToast({title: res.msg,icon: 'none'}) uni.showToast({
title: res.msg,
icon: 'none'
})
} }
}); });
}, },
...@@ -164,14 +203,17 @@ ...@@ -164,14 +203,17 @@
this.currentSwiper = e.detail.current this.currentSwiper = e.detail.current
}, },
getDetail() { getDetail() {
uni.showLoading({title: '正在加载中...',mask: true}) uni.showLoading({
title: '正在加载中...',
mask: true
})
homeservice.WorksList({ homeservice.WorksList({
machine_id: this.machine_id, machine_id: this.machine_id,
// s: 'machine.detail' // s: 'machine.detail'
s: 'machine.newDetail' s: 'machine.newDetail'
}).then(res => { }).then(res => {
this.statusloading = 1; this.statusloading = 1;
if(res){ if (res) {
this.list = res; this.list = res;
this.myheadtext = this.machine_id + '-' + res.code //头部标题栏 this.myheadtext = this.machine_id + '-' + res.code //头部标题栏
} }
...@@ -186,13 +228,20 @@ ...@@ -186,13 +228,20 @@
uni.hideLoading(); uni.hideLoading();
}); });
}, },
Adlist(){ // 轮播图 Adlist() { // 轮播图
homeservice.queryList({s: 'Ad.list',ad_position_key: 'golf_machine',machine_id:this.machine_id}).then(result => { homeservice.queryList({
s: 'Ad.list',
ad_position_key: 'currency_banner',
machine_id: this.machine_id
}).then(result => {
this.Adlists = result this.Adlists = result
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}).catch(err => { }).catch(err => {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.showToast({title: err.msg,icon: 'none'}); uni.showToast({
title: err.msg,
icon: 'none'
});
}); });
}, },
getQueryString(url, name) { getQueryString(url, name) {
...@@ -224,27 +273,30 @@ ...@@ -224,27 +273,30 @@
}; };
return shareObj; return shareObj;
}, },
onShareTimeline() { /* onShareTimeline() {
return { return {
title: this.$Env.getmalltext(), title: this.$Env.getmalltext(),
path: '/pages/mall/machineDetail?machine_id=' + this.machine_id, path: '/pages/mall/machineDetail?machine_id=' + this.machine_id,
imageUrl:'', imageUrl:'',
query: 'kjbfrom=pyq' query: 'kjbfrom=pyq'
} }
}, }, */
onLoad(options) { onLoad(options) {
// console.log(options) // console.log(options)
if(options.machine_id){ //if(options.machine_id){
this.machine_id = options.machine_id this.machine_id = this.$Env.getmachineId();
this.myheadtext = this.machine_id + "-定制";
this.$base.machine_id = this.machine_id this.$base.machine_id = this.machine_id
this.getDetail() //获取数据 this.statusloading = 1;
this.Adlist()// 轮播图 //this.getDetail() //获取数据
} this.Adlist() // 轮播图
if(options.worksid){ //控制导航返回 // console.log("进来="+this.machine_id)
//}
/* if(options.worksid){ //控制导航返回
this.worksid = options.worksid this.worksid = options.worksid
} } */
// 自定义获取二维码的携带的链接信息 // 自定义获取二维码的携带的链接信息
if (options.q) { /* if (options.q) {
let qrUrl = decodeURIComponent(options.q) let qrUrl = decodeURIComponent(options.q)
this.machine_id = this.getQueryString(qrUrl, 'machine_id') this.machine_id = this.getQueryString(qrUrl, 'machine_id')
this.$base.promoter_id = this.getQueryString(qrUrl, 'promoter_id') this.$base.promoter_id = this.getQueryString(qrUrl, 'promoter_id')
...@@ -254,19 +306,21 @@ ...@@ -254,19 +306,21 @@
this.$base.machine_id = this.machine_id this.$base.machine_id = this.machine_id
this.getDetail() //获取数据 this.getDetail() //获取数据
this.Adlist()// 轮播图 this.Adlist()// 轮播图
} } */
}, },
onShow(){}, onShow() {},
onHide(){} onHide() {}
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import "../index/css/main.css"; @import "../index/css/main.css";
page { page {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #FFFFFF; background: #FFFFFF;
// 错误提示信息 // 错误提示信息
.start { .start {
.start_img { .start_img {
...@@ -275,11 +329,13 @@ ...@@ -275,11 +329,13 @@
display: block; display: block;
margin: 0upx auto 102upx; margin: 0upx auto 102upx;
} }
.start_title { .start_title {
font-size: 30upx; font-size: 30upx;
text-align: center; text-align: center;
color: #FFFFFF; color: #FFFFFF;
} }
.start_text { .start_text {
width: 70%; width: 70%;
text-align: center; text-align: center;
......
pages/index/scrollView.vue
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
this.tip = '释放刷新'; this.tip = '释放刷新';
}, },
finished() { finished() {
this.tip = '下拉刷新'; this.tip = '';
}, },
scroll(e) { 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 @@ ...@@ -18,23 +18,21 @@
<view style="color: #fff; display: flex; align-items: center;"> <view style="color: #fff; display: flex; align-items: center;">
<view v-if="designer.user_id != userId" <view v-if="designer.user_id != userId"
style="margin:10upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; opacity: 0.2;"> 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: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0; <image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png" mode="aspectFit">
margin:auto; z-index: 1;"/> --> <image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png" </imag :src="designer.front_image_old" mode="aspectFit">
mode="aspectFit"></imag </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; <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'" margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit"></image>
mode="aspectFit"></image>
<!-- <image style="width: 140upx; height: 140upx;position: absolute; top: 0; left: 0; right: 0; bottom: 0; <!-- <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> --> margin:auto; z-index: 3;" :src="designer.front_image" mode="aspectFit"></image> -->
</view> </view>
<view v-if="designer.user_id == userId" <view v-if="designer.user_id == userId"
style="margin:10upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; "> 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; <!-- <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> mode="aspectFit"></image>
:src="designer.front_image_old" 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; <image style="width: 70upx; height: 70upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
...@@ -44,7 +42,6 @@ ...@@ -44,7 +42,6 @@
margin:auto; z-index: 3;" :src="designer.front_image" mode="aspectFit"></image> --> margin:auto; z-index: 3;" :src="designer.front_image" mode="aspectFit"></image> -->
</view> </view>
<view style="width: calc(100% - 360upx);"> <view style="width: calc(100% - 360upx);">
<view style="width: 90%;font-size: 28upx;"> <view style="width: 90%;font-size: 28upx;">
<text style="font-size: 40upx;font-weight: bold;">{{designer.id || ''}}</text> <text style="font-size: 40upx;font-weight: bold;">{{designer.id || ''}}</text>
...@@ -67,7 +64,6 @@ ...@@ -67,7 +64,6 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 提示 --> <!-- 提示 -->
...@@ -83,7 +79,21 @@ ...@@ -83,7 +79,21 @@
<image src="../../static/icon_guanbi.png" mode="" <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>
<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; <view style="display: flex; align-items: center; justify-content: center;
width: 500upx; height: 350upx; position: relative; margin: auto;"> width: 500upx; height: 350upx; position: relative; margin: auto;">
<view style="width: 100%; height: 100%; display: flex; border: 1px solid #09BB07;"> <view style="width: 100%; height: 100%; display: flex; border: 1px solid #09BB07;">
...@@ -107,6 +117,35 @@ ...@@ -107,6 +117,35 @@
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view> <view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view> <view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</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>
</view> </view>
...@@ -228,7 +267,7 @@ ...@@ -228,7 +267,7 @@
}, },
// 做滚动加载使用 // 做滚动加载使用
loadMore() { loadMore() {
console.log('滚动加载') //console.log('滚动加载')
// if (Math.ceil(this.queryPage.total / this.queryPage.per_page) < this.queryPage.page) { // if (Math.ceil(this.queryPage.total / this.queryPage.per_page) < this.queryPage.page) {
// return setTimeout(() => { // return setTimeout(() => {
// uni.showToast({ // uni.showToast({
...@@ -263,27 +302,9 @@ ...@@ -263,27 +302,9 @@
icon: 'none' icon: 'none'
}); });
}, 500); }, 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) { onLoad(options) {
//console.log("options.machine_id="+options.machine_id);
this.queryPage.machine_id = options.machine_id; this.queryPage.machine_id = options.machine_id;
this.key = options.key || 2; this.key = options.key || 2;
this.LoupanList = [] this.LoupanList = []
...@@ -306,6 +327,22 @@ ...@@ -306,6 +327,22 @@
// 卸载程序 // 卸载程序
onUnload() { onUnload() {
this.clearIntervalTime() 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> </script>
......
pages/mine/self_help_payment_details.vue
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 高尔夫球图 --> <!-- 色彩公园Lite球图 -->
<view v-if="initstate" :style="{'z-index': data.render_cove_width ? 6:0}" <view v-if="initstate" :style="{'z-index': data.render_cove_width ? 6:0}"
style="display: flex; align-items: center; justify-content: center; style="display: flex; align-items: center; justify-content: center;
position: absolute; width: 100%; height: 100%; left: 0; top: 0; position: absolute; width: 100%; height: 100%; left: 0; top: 0;
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 高尔夫球图 --> <!-- 色彩公园Lite球图 -->
<view v-if="initstate" :style="{'z-index': data.render_cove_width ? 5:0}" <view v-if="initstate" :style="{'z-index': data.render_cove_width ? 5:0}"
style="display: flex; align-items: center; justify-content: center; style="display: flex; align-items: center; justify-content: center;
position: absolute; width: 100%; height: 100%; left: 0; top: 0; position: absolute; width: 100%; height: 100%; left: 0; top: 0;
......
service/UserService.js
...@@ -63,6 +63,6 @@ export default service ...@@ -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:} * 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 = { ...@@ -43,7 +43,7 @@ const service = {
export default service export default service
/** /**
* url:/golf/index * url:/lite/index
* *
* 获取附件店铺 * 获取附件店铺
* query：{s: 'Machine.shopList',longitude: ,latitude: ,distance:} * 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) ...@@ -18,10 +18,10 @@ console.log(accountInfo.miniProgram.envVersion)
const Env = { const Env = {
getDevBaseURL: () => baseURL, getDevBaseURL: () => baseURL,
getBaseURL: () => baseURL, getBaseURL: () => baseURL,
getmachineId: () => '100036', //线上100086 //测试 100036' //100086 getmachineId: () => '100054', //线上100086 //测试 422001' //100086
getappcode: () => 'golf', getappcode: () => 'lite',
getmalltext: () => "色彩公园Lite", getmalltext: () => "色彩公园Lite",
getAppID: () => "wx90d72bea4d5222b6", getAppID: () => "wx1c777ee874c39b0b",
getcompany: () => "深圳市瑞丰彩科技有限公司" getcompany: () => "深圳市瑞丰彩科技有限公司"
} }
export default Env 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