Skip to content

W
wechat_baking
Commit e12f7f84 by huahua
Options

提交

parent 1bacd920
Showing with 274 additions and 171 deletions
pages/index/index.vue
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
<!-- 替换选项 --> <!-- 替换选项 -->
<!-- 字体 --> <!-- 字体 -->
<uni-popup ref="textsettingsshare" type="bottom" @change="change" style="position: fixed; z-index: 9999;"> <uni-popup ref="textsettingsshare" type="bottom" @change="change" style="position: fixed; z-index: 99999;">
<view class="uni-share" style="width: 100%; height: 600upx;background: #292933;" <view class="uni-share" style="width: 100%; height: 600upx;background: #292933;"
v-if="e_active == 3 || e_active == 4"> v-if="e_active == 3 || e_active == 4">
<textsettings @textInput='textInput' @cancel="cancel" @workcolor="workcolor" <textsettings @textInput='textInput' @cancel="cancel" @workcolor="workcolor"
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
<!-- 文本，贴图，相框 1模板 2贴图 3字体 4编辑 22添加相框 --> <!-- 文本，贴图，相框 1模板 2贴图 3字体 4编辑 22添加相框 -->
<uni-popup ref="showshare" :type="type" @change="change" <uni-popup ref="showshare" :type="type" @change="change"
style="position: relative; z-index: 9999; width: 100%;" :style="{height: data.windowHeight +'px'}"> style="position: relative; z-index: 9998; width: 100%;" :style="{height: data.windowHeight +'px'}">
<!-- 文本 --> <!-- 文本 -->
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}" <view class="uni-share full-width" :style="{height: data.windowHeight +'px'}"
v-if="e_active == 3 || e_active == 4"> v-if="e_active == 3 || e_active == 4">
...@@ -514,38 +514,55 @@ ...@@ -514,38 +514,55 @@
</view> </view>
</uni-popup> </uni-popup>
<!-- Ai转换 --> <!-- Ai转换 -->
<uni-popup ref="showAiChange" type="center" style="position: fixed; z-index: 9999; "> <uni-popup ref="showAiChange" type="center" style="position: fixed; z-index: 9999; ">
<view style="height: 600upx;border-radius:20upx; background: #fff;width: 600upx;"> <view style="height: 950upx;border-radius:20upx; background: #fff;width: 600upx;">
<image src="../../static/img/icon_close_image.png" style="width: 30upx; <image src="../../static/img/icon_close_image.png" style="width: 30upx;
padding: 30upx; padding: 30upx;
position: absolute; position: absolute;
right:0; right:0;
top:0; top:0;
z-index: 999;" mode="widthFix" @click="showAiChangeClose()"> z-index: 999;" mode="widthFix" @click="showAiChangeClose()">
</image> </image>
<view style="height: 400upx; padding-top: 80upx;width: 100%; <view style="height: 360upx; padding-top: 80upx;width: 100%;
align-items: center; align-items: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center;"> justify-content: center;">
<view style="align-items: center;"> <view style="align-items: center;">
<image style="width:160upx;height:160upx;" src="../../static/icon_diy_anime_style.png" <image style="width:160upx;height:160upx;" src="../../static/icon_diy_anime_style.png"
@click="showAiChangeType(1)"></image> @click="showAiChangeType(1)"></image>
<view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;"> 动漫风格 <view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;">动漫风格
</view> </view>
</view> </view>
<view style="align-items: center;margin-left: 100upx;"> <view style="align-items: center;margin-left: 100upx;">
<image style="width:160upx;height:160upx; " src="../../static/icon_diy_sketch_style.png" <image style="width:160upx;height:160upx; " src="../../static/icon_diy_sketch_style.png"
@click="showAiChangeType(2)"></image> @click="showAiChangeType(2)"></image>
<view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;"> 素描风格 <view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;">素描风格
</view> </view>
</view> </view>
</view> </view>
<view style="font-size: 30upx;color:#333; width:100%;text-align: center;margin: auto; "> <view style="height: 360upx; padding-top: 40upx;width: 100%;
选中的图片必须带有清晰人物头像 </view> align-items: center;
</view> display: flex;
</uni-popup> flex-direction: row;
justify-content: center;">
<view style="align-items: center;margin-left: 20upx;">
<image style="width:160upx;height:160upx; " src="../../static/icon_diy_matting_style.png"
@click="showAiChangeType(3)"></image>
<view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;">人像抠图</view>
</view>
<view style="align-items: center;margin-left: 100upx;">
<image style="width:160upx;height:160upx; " src="../../static/icon_diy_enhance_style.png"
@click="showAiChangeType(4)"></image>
<view style="width:160upx;height:160upx;text-align: center;line-height: 160upx;">色彩增强</view>
</view>
</view>
<view style="font-size: 30upx;color:#333; width:100%;text-align: center;margin: auto;">选中的图片必须带有清晰人物头像</view>
</view>
</uni-popup>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodSizeItem" @toCustomSize="toCustomSize"></switchGoods> <switchGoods ref="switchGoods" @selectGoodItem="selectGoodSizeItem" @toCustomSize="toCustomSize"></switchGoods>
<!--商品弹框 --> <!--商品弹框 -->
...@@ -3289,7 +3306,7 @@ ...@@ -3289,7 +3306,7 @@
}, },
async text_awaitone(content) { async text_awaitone(content) {
// 获取当前选中的部件 // 获取当前选中的部件
if (content == '' || contente == null) { if (content == '' || content == null) {
var item = items[index]; var item = items[index];
if (item != null) { if (item != null) {
this.deleteItem(); this.deleteItem();
......
pages/index/machineDetail.vue
...@@ -30,9 +30,13 @@ ...@@ -30,9 +30,13 @@
background: linear-gradient(92deg, #E6B01A, #F29F3D); background: linear-gradient(92deg, #E6B01A, #F29F3D);
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 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 @click="toProxyApplet()" v-if="list.is_open_manage == 1"
style="position: fixed; bottom: 35upx; text-align: center;left: 0; right: 0;font-size: 32upx; margin: auto; color: #fff;">
运营中心</view> -->
</view> </view>
<!-- 错误提示信息 --> <!-- 错误提示信息 -->
...@@ -63,9 +67,18 @@ ...@@ -63,9 +67,18 @@
<Signin ref="Signin"></Signin> <Signin ref="Signin"></Signin>
<view v-if="statusloading == 1" @tap="toLineList" <view v-if="statusloading == 1" @tap="toLineList"
style="position: fixed; z-index: 99; right: 0; bottom: 300upx; width: 109upx; height: 123upx;"> style="position: fixed; z-index: 99; right: 0; bottom: 440upx; width: 109upx; height: 123upx;">
<image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image> <image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
</view> </view>
<view @click="toProxyApplet()" v-if="list.is_open_manage == 1" style="position: fixed; z-index: 99; right: 0; bottom: 300upx; display: flex;align-items: center;justify-content: center;
width: 100upx; height: 88upx; background: #F29F3D; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>运营</view>
<view>中心</view>
</view>
</view>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem" @toCustomSize="toCustomSize"></switchGoods> <switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem" @toCustomSize="toCustomSize"></switchGoods>
<!--//商品弹框 --> <!--//商品弹框 -->
...@@ -80,6 +93,7 @@ ...@@ -80,6 +93,7 @@
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 switchGoods from '../index/switchGoods.vue'; //选择商品 import switchGoods from '../index/switchGoods.vue'; //选择商品
import Env from '@/util/Env.js';
export default { export default {
components: { components: {
...@@ -105,17 +119,77 @@ ...@@ -105,17 +119,77 @@
currentIndex: 0, currentIndex: 0,
selectItem: null, //选择对象 selectItem: null, //选择对象
name: "", name: "",
show_admin_login: 0
}; };
}, },
methods: { methods: {
//调转代理小程序
toProxyApplet() {
var url = Env.getBaseURL();
var envVersionName = "trial";
if (url.indexOf("colorpark") != -1) {
envVersionName = "release";
}
wx.navigateToMiniProgram({
appId: 'wx9cd3934f286f3d71',
envVersion: envVersionName,
path: 'pages/index/start-up?machine_id=' + this.machine_id + "&partner_id=" + this.list.partner_id + "&appletType=5",
success(res) {
}
})
},
//调转代理小程序
// toProxyApplet() {
// var url = Env.getBaseURL();
// var envVersionName = "trial";
// if (url.indexOf("colorpark") != -1) {
// envVersionName = "release";
// }
// wx.navigateToMiniProgram({
// appId: 'wx9cd3934f286f3d71',
// envVersion: envVersionName,
// success(res) {
// }
// })
// },
//首次进来检查是否
toFirstCheck() {
let that = this;
uni.login({
provider: 'weixin',
success: (res) => {
userService.login({
s: 'Init.checkAdminAuth',
code: res.code,
partner_id: that.list.partner_id
}).then(result => {
that.show_admin_login = result.show_admin_login
}).catch(err => {
});
},
fail: (res) => {
}
});
},
//自定义尺寸 //自定义尺寸
toCustomSize() { toCustomSize() {
uni.navigateTo({ uni.navigateTo({
url: '../mall/size?machine_id=' + this.machine_id + url: '../mall/size?machine_id=' + this.machine_id +
"&isFirstPage=true" + "&isFirstPage=true" +
"&machineDetail=" + JSON.stringify(this.list) "&machineDetail=" + JSON.stringify(this.list)
}) })
}, },
...@@ -133,23 +207,25 @@ ...@@ -133,23 +207,25 @@
//选择商品进来 //选择商品进来
selectGoodItem(item) { selectGoodItem(item) {
uni.navigateTo({ uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id + url: '../index/index?machine_id=' + this.machine_id +
"&good_id=" + item.id + "&good_id=" + item.id +
"&title=" + item.title + "&title=" + item.title +
"&real_width=" + item.key + "&real_width=" + item.key +
"&machineDetail=" + JSON.stringify(this.list) + "&machineDetail=" + JSON.stringify(this.list) +
"&type = 1" "&type = 1"
}) })
}, },
//立即定制 //立即定制
Customize_now() { Customize_now() {
let that = this;
if (!this.$AppContext.checkLogin()) { if (!this.$AppContext.checkLogin()) {
this.tologo(1) this.tologo(1)
} else { } else {
let isShowCustomizeData = this.list.customize_size == 1 ? true : false let isShowCustomizeData = this.list.customize_size == 1 ? true : false
this.$refs['switchGoods'].open(this.machine_id,isShowCustomizeData); this.$refs['switchGoods'].open(this.machine_id, isShowCustomizeData);
} }
}, },
...@@ -187,7 +263,9 @@ ...@@ -187,7 +263,9 @@
code: res.code code: res.code
}).then(r => { }).then(r => {
if (type == 1) { if (type == 1) {
that.$refs['switchGoods'].open(that.machine_id); let isShowCustomizeData = that.list.customize_size == 1 ? true : false
that.$refs['switchGoods'].open(that.machine_id, isShowCustomizeData);
//that.$refs['switchGoods'].open(that.machine_id);
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../mall/lineUp?machine_id=' + that.machine_id + url: '../mall/lineUp?machine_id=' + that.machine_id +
...@@ -225,6 +303,7 @@ ...@@ -225,6 +303,7 @@
this.statusloading = 1; this.statusloading = 1;
if (res) { if (res) {
this.list = res; this.list = res;
this.toFirstCheck();
this.myheadtext = this.machine_id + '-' + res.code //头部标题栏 this.myheadtext = this.machine_id + '-' + res.code //头部标题栏
} }
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
...@@ -291,7 +370,7 @@ ...@@ -291,7 +370,7 @@
this.$base.machine_id = this.machine_id this.$base.machine_id = this.machine_id
this.statusloading = 1; this.statusloading = 1;
this.Adlist() // 轮播图 this.Adlist() // 轮播图
this.getDetail(); //this.getDetail();
}, },
onShow() { onShow() {
...@@ -299,7 +378,7 @@ ...@@ -299,7 +378,7 @@
}, },
onHide() { onHide() {
} }
}; };
...@@ -376,4 +455,4 @@ ...@@ -376,4 +455,4 @@
transition: all 0.2s ease-in 0s; transition: all 0.2s ease-in 0s;
z-index: 20; z-index: 20;
} }
</style> </style>
\ No newline at end of file
static/icon_default_no.png
static/icon_default_no.png

39.4 KB | W: | H:

static/icon_default_no.png

6.65 KB | W: | H:

static/icon_default_no.png
static/icon_default_no.png
static/icon_default_no.png
static/icon_default_no.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy.png
static/icon_diy.png

50.5 KB | W: | H:

static/icon_diy.png

10 KB | W: | H:

static/icon_diy.png
static/icon_diy.png
static/icon_diy.png
static/icon_diy.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png

37.3 KB | W: | H:

static/icon_diy_anime_style.png

9.98 KB | W: | H:

static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png

17.5 KB | W: | H:

static/icon_diy_sketch_style.png

4.89 KB | W: | H:

static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
  • 2-up
  • Swipe
  • Onion skin
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