Skip to content

W
wechat_currency
Commit 4d7a7ef9 by huahua
Options

提交

parent 8109e487
Showing with 77 additions and 51 deletions
pages/index/head/head.vue
<template> <template>
<view :style="{ height: height + 'px', background:background}" style="position: fixed; z-index: 888;"> <view :style="{ height: height + 'px', background:background}" style="position: fixed; z-index: 888;">
<view class="head" :style="{ height: height + 'px', background:background}"> <view class="head" :style="{ height: height + 'px', background:background}">
<view class="back" @click="back" v-if="backShow" :style="{ top: top + 'px', color:color }"> <view class="back" @click="back" :style="{ top: top + 'px', color:color }">
<image src="../../../static/recommend/icon_back_black.png" mode="aspectFit"
<image v-if="worksid > 0" mode="aspectFit"
style="width: 40upx; height: 40upx; margin-top: calc((32px - 39upx)/2);margin-left: auto; margin-right: auto;"></image>
<image v-else src="../../../static/recommend/icon_back_black.png"
mode="aspectFit" style="width: 40upx; height: 40upx; margin-top: calc((32px - 39upx)/2);margin-left: auto; margin-right: auto;"></image>
<!-- <image src="../../../static/recommend/icon_back_black.png" mode="aspectFit"
style="width: 40upx; height: 40upx; margin-top: 17upx;margin-left: auto; margin-right: auto;"> style="width: 40upx; height: 40upx; margin-top: 17upx;margin-left: auto; margin-right: auto;">
</image> </image> -->
</view> </view>
<view class="title" v-if="titleShow" :style="{ top: top + 'px', color:color, 'font-size': size + 'rpx' }"> <view class="title" v-if="titleShow" :style="{ top: top + 'px', color:color, 'font-size': size + 'rpx' }">
{{title}}</view> {{title}}</view>
...@@ -15,6 +21,10 @@ ...@@ -15,6 +21,10 @@
<script> <script>
export default { export default {
props: { props: {
worksid:{
type: Number,
default: null
},
title: { title: {
type: String, type: String,
default: '自定义标题' default: '自定义标题'
...@@ -63,13 +73,25 @@ ...@@ -63,13 +73,25 @@
}, },
methods: { methods: {
back() { back() {
if (!this.isBack) {
console.log(this.worksid)
if(this.worksid > 0){
}else{
if(this.worksid == -100211){
uni.redirectTo({ url: '../index/mall' })
}else{
uni.navigateBack();
}
}
/* if (!this.isBack) {
uni.navigateBack(); uni.navigateBack();
} else { } else {
uni.reLaunch({ uni.reLaunch({
url: '../index/mall' url: '../index/mall'
}) })
} } */
} }
}, },
onLoad(options) { onLoad(options) {
......
pages/index/index.vue
...@@ -279,6 +279,16 @@ ...@@ -279,6 +279,16 @@
3、关闭上传相片，要同时关掉：上传相片、添加文字、添加涂鸦 3、关闭上传相片，要同时关掉：上传相片、添加文字、添加涂鸦
4、排队列表，没有打印中状态的，全都是排队中 --> 4、排队列表，没有打印中状态的，全都是排队中 -->
<!-- 1、is_authority官方功能：手机壁纸、贴图素材、背景底色、相框形状、智能推荐
2、is_photo上传图片：上传相片、添加文字、添加涂鸦
3、is_recommend智能推荐：AI图像、AI画图
4、is_home 返回首页：设备页不可返回首页 -->
<!-- this.machine_item -->
<!-- 菜单栏目 --> <!-- 菜单栏目 -->
<view v-if="!active && !guide_left" class="toolRight"> <view v-if="!active && !guide_left" class="toolRight">
<view class="tool_li"> <view class="tool_li">
...@@ -288,53 +298,53 @@ ...@@ -288,53 +298,53 @@
<view class="tool_li_text">历史作品</view> <view class="tool_li_text">历史作品</view>
</view> </view>
<view class="tool_li" @click="showPopup(23)" v-if="is_public == 1"> <view class="tool_li" @click="showPopup(23)" v-if="is_authority == 1">
<image class="tool_li_img" src="../../static/icon_diy_wallpaper.png" mode=""></image> <image class="tool_li_img" src="../../static/icon_diy_wallpaper.png" mode=""></image>
<view class="tool_li_text">全幅壁纸</view> <view class="tool_li_text">全幅壁纸</view>
</view> </view>
<view class="tool_li" @click="showPopup(2)" v-if="is_public == 1"> <view class="tool_li" @click="showPopup(2)" v-if="is_authority == 1">
<image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode=""></image> <image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode=""></image>
<view class="tool_li_text">贴图素材</view> <view class="tool_li_text">贴图素材</view>
</view> </view>
<view class="tool_li" @click="showPopup(24)" v-if="surface_type != 1"> <view class="tool_li" @click="showPopup(24)" v-if="is_authority == 1" >
<image class="tool_li_img" src="../../static/icon_make_diy_uplaod_image.png" mode=""></image> <image class="tool_li_img" src="../../static/icon_make_diy_uplaod_image.png" mode=""></image>
<view class="tool_li_text">背景底色</view> <view class="tool_li_text">背景底色</view>
</view> </view>
<view class="tool_li" @click="showone = !showone" v-if="diy_upload_menu == 1"> <view class="tool_li" @click="showone = !showone" v-if="is_photo == 1" >
<image @click="cancel('share')" class="tool_li_img" <image @click="cancel('share')" class="tool_li_img"
src="../../static/icon_make_diy_back_color.png" mode=""></image> src="../../static/icon_make_diy_back_color.png" mode=""></image>
<view @click="cancel()" class="tool_li_text">上传相片</view> <view @click="cancel()" class="tool_li_text">上传相片</view>
</view> </view>
<view class="tool_li" @click="showPopup(3)" v-if="diy_upload_menu == 1"> <view class="tool_li" @click="showPopup(3)" v-if="is_photo == 1" >
<image class="tool_li_img" src="../../static/icon_diy_typeface.png" <image class="tool_li_img" src="../../static/icon_diy_typeface.png"
style="width: 45upx; height: 40upx;" mode=""></image> style="width: 45upx; height: 40upx;" mode=""></image>
<view @click="cancel()" class="tool_li_text">添加文字</view> <view @click="cancel()" class="tool_li_text">添加文字</view>
</view> </view>
<view class="tool_li" @click="ontuya()"v-if="diy_upload_menu == 1" > <view class="tool_li" @click="ontuya()"v-if="is_photo == 1" >
<image class="tool_li_img" style="width: 62upx; height: 55upx;" src="../../static/icon_tuya.png" <image class="tool_li_img" style="width: 62upx; height: 55upx;" src="../../static/icon_tuya.png"
mode=""></image> mode=""></image>
<view class="tool_li_text">添加涂鸦</view> <view class="tool_li_text">添加涂鸦</view>
</view> </view>
<view class="tool_li" @click="wallpaperOnclick()" v-if="is_pubilc == 1"> <view class="tool_li" @click="wallpaperOnclick()" v-if="is_recommend == 1">
<image class="tool_li_img" style="width: 71upx; height: 59upx;" <image class="tool_li_img" style="width: 71upx; height: 59upx;"
src="../../static/randomwallpaper.png" mode=""></image> src="../../static/randomwallpaper.png" mode=""></image>
<view class="tool_li_text">智能推荐</view> <view class="tool_li_text">智能推荐</view>
</view> </view>
<!-- AI图像 --> <!-- AI图像 -->
<view class="tool_li" @click.stop='showAiChange()'> <view class="tool_li" @click.stop='showAiChange()' v-if="is_recommend == 1">
<image class="tool_li_img" style="width: 51upx; height: 38upx;" <image class="tool_li_img" style="width: 51upx; height: 38upx;"
src="../../static/icon_diy_ai.png" mode=""></image> src="../../static/icon_diy_ai.png" mode=""></image>
<view class="tool_li_text">AI图像</view> <view class="tool_li_text">AI图像</view>
</view> </view>
<view class="tool_li" @click="openAiMakePicture()"> <view class="tool_li" @click="openAiMakePicture()" v-if="is_recommend == 1">
<image class="tool_li_img" style="width: 44upx; height: 42upx;" <image class="tool_li_img" style="width: 44upx; height: 42upx;"
src="../../static/icon_diy_draw_designs.png" mode=""></image> src="../../static/icon_diy_draw_designs.png" mode=""></image>
<view class="tool_li_text">AI画图</view> <view class="tool_li_text">AI画图</view>
...@@ -880,7 +890,11 @@ ...@@ -880,7 +890,11 @@
radioGroup: ['现代风', '卡通风', '铅笔画风'], radioGroup: ['现代风', '卡通风', '铅笔画风'],
upLoadImageUrl: "", //上传图片地址 upLoadImageUrl: "", //上传图片地址
diy_upload_menu:0, diy_upload_menu:0,
is_public:0 is_public:0,
is_authority:0,
is_photo:0,
is_recommend:0,
is_home:0
}; };
}, },
...@@ -2064,23 +2078,22 @@ ...@@ -2064,23 +2078,22 @@
machine_id: this.machine_id machine_id: this.machine_id
}).then(res => { }).then(res => {
that.machine_item = res that.machine_item = res
that.is_authority = res.is_authority
console.log(res) that.is_photo = res.is_photo
that.is_recommend = res.is_recommend
that.is_home = res.is_home
//判断配送版 //判断配送版
if (res.delivery == 1 && res.machine_category_id == "64") { if (res.delivery == 1 && res.machine_category_id == "64") {
//this.key = 1; //this.key = 1;
this.isComeDelivery = true; this.isComeDelivery = true;
} //key:null,//1直营配送站 2 万能通用版 3色彩自助站 } //key:null,//1直营配送站 2 万能通用版 3色彩自助站
this.machine_item = res
//that.diy_upload_menu = that.machine_item.diy_upload_menu //that.diy_upload_menu = that.machine_item.diy_upload_menu
//that.support_pay = res.support_pay //单机版是否支付 //that.support_pay = res.support_pay //单机版是否支付
//that.is_public = res.is_public //that.is_public = res.is_public
this.diy_upload_menu = res.diy_upload_menu; that.diy_upload_menu = res.diy_upload_menu;
this.is_public = res.is_public; that.is_public = res.is_public;
this.support_pay = res.support_pay that.support_pay = res.support_pay
// 先登陆 // 先登陆
...@@ -3948,13 +3961,13 @@ ...@@ -3948,13 +3961,13 @@
lastSnapshot = JSON.stringify(snapshot[snapshotIndex]); lastSnapshot = JSON.stringify(snapshot[snapshotIndex]);
} }
if (currentSnapshot != lastSnapshot) { if (currentSnapshot != lastSnapshot) {
// 清除当前步骤后面的所有步骤 //清除当前步骤后面的所有步骤
if (snapshot.length > 0 && (snapshot.length - 1 > snapshotIndex)) { if (snapshot.length > 0 && (snapshot.length - 1 > snapshotIndex)) {
for (var i = snapshotIndex + 1; i < snapshot.length; i++) { for (var i = snapshotIndex + 1; i < snapshot.length; i++) {
snapshot.pop(); snapshot.pop();
} }
} }
// 加入快照 //加入快照
snapshot.push(currentSnapshot); snapshot.push(currentSnapshot);
snapshotIndex = snapshotIndex + 1; snapshotIndex = snapshotIndex + 1;
} }
...@@ -4378,8 +4391,14 @@ ...@@ -4378,8 +4391,14 @@
this.diy_upload_menu = res.diy_upload_menu; this.diy_upload_menu = res.diy_upload_menu;
this.is_public = res.is_public; this.is_public = res.is_public;
this.support_pay = res.support_pay this.support_pay = res.support_pay
console.log(this.diy_upload_menu);
console.log(this.is_public); this.is_authority = res.is_authority
this.is_photo = res.is_photo
this.is_recommend = res.is_recommend
this.is_home = res.is_home
//console.log(this.diy_upload_menu);
//console.log(this.is_public);
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.msg, title: err.msg,
...@@ -4831,7 +4850,6 @@ ...@@ -4831,7 +4850,6 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: auto; margin-left: auto;
} }
.grey { .grey {
background: #8F8F94 !important; background: #8F8F94 !important;
} }
......
pages/index/machineDetail.vue
...@@ -30,9 +30,7 @@ ...@@ -30,9 +30,7 @@
background: linear-gradient(92deg, #47e5e5, #47e5e5); background: linear-gradient(92deg, #47e5e5, #47e5e5);
box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35); box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35);
border-radius: 40px;"> border-radius: 40px;">
<view <view style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">立即定制</view>
style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">
立即定制</view>
</view> </view>
</view> </view>
...@@ -59,6 +57,7 @@ ...@@ -59,6 +57,7 @@
<text style="font-size: 22upx;">深圳市瑞丰彩科技有限公司</text> <text style="font-size: 22upx;">深圳市瑞丰彩科技有限公司</text>
</view> </view>
</view> </view>
<!-- 登录弹框 --> <!-- 登录弹框 -->
<Signin ref="Signin"></Signin> <Signin ref="Signin"></Signin>
...@@ -68,8 +67,7 @@ ...@@ -68,8 +67,7 @@
</view> </view>
<view @click="toProxyApplet()" v-if="list.is_open_manage == 1" <view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
style="position: fixed; z-index: 99; right: 0; bottom: 280upx; display: flex;align-items: center;justify-content: center; style="position: fixed; z-index: 99; right: 0; bottom: 280upx; display: flex;align-items: center;justify-content: center;width: 100upx; height: 88upx; background: #47e5e5; border-radius: 44upx 0px 0px 44upx;">
width: 100upx; height: 88upx; background: #47e5e5; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;"> <view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>运营</view> <view>运营</view>
<view>中心</view> <view>中心</view>
...@@ -122,7 +120,6 @@ ...@@ -122,7 +120,6 @@
methods: { methods: {
//调转代理小程序 //调转代理小程序
toProxyApplet() { toProxyApplet() {
var url = Env.getBaseURL(); var url = Env.getBaseURL();
...@@ -141,22 +138,6 @@ ...@@ -141,22 +138,6 @@
}, },
//调转代理小程序
/* toProxyApplet() {
var url = Env.getBaseURL();
var envVersionName = "trial";
if (url.indexOf("colorpark") != -1) {
envVersionName = "release";
}
wx.navigateToMiniProgram({
appId: 'wx9cd3934f286f3d71',
envVersion: envVersionName,
success(res) {
}
})
}, */
//首次进来检查是否 //首次进来检查是否
toFirstCheck() { toFirstCheck() {
let that = this; let that = this;
...@@ -272,6 +253,11 @@ ...@@ -272,6 +253,11 @@
this.statusloading = 1; this.statusloading = 1;
if (res) { if (res) {
this.list = res; this.list = res;
if(this.list.is_home == 1){
this.worksid = -100211
}else{
this.worksid = 100211
}
this.toFirstCheck(); this.toFirstCheck();
this.myheadtext = this.machine_id//头部标题栏 this.myheadtext = this.machine_id//头部标题栏
} }
...@@ -280,7 +266,7 @@ ...@@ -280,7 +266,7 @@
}).catch(err => { }).catch(err => {
this.msg = err.msg this.msg = err.msg
this.statusloading = 2; this.statusloading = 2;
this.phone = err.data.phone || '18938664545' this.phone = err.data.phone
this.myheadtext = '歇一歇' this.myheadtext = '歇一歇'
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); uni.hideLoading();
......
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