Skip to content

W
wechat_currency
Commit 9a1b6f15 by huahua
Options

提交

parent 4d7a7ef9
Showing with 91 additions and 14 deletions
App.vue
......@@ -8,7 +8,7 @@
},
onLaunch: function() {
// 字体列表
homeservice.queryList({
/* homeservice.queryList({
s: 'Material.fontFamilyList'
}).then(result => {
result.forEach(item=>{
......@@ -58,7 +58,7 @@
})
}).catch(err => {
});
}); */
},
onShow: function() {
//调用监听网络状态的方法
......
pages/index/machineDetail.vue
......@@ -38,13 +38,14 @@
<view v-if="statusloading == 2" style="min-height: 100%;background: #131319 !important;">
<view class="start" style="padding-bottom: 100upx; padding-top: 200upx;">
<image src="../../static/icon_guaqi.png" mode="aspectFill" class="start_img"></image>
<view class="start_text" style="margin-top: -80upx;font-size: 31upx;">{{machine_id || ''}}</view>
<view class="start_text">{{msg || ''}}</view>
<view @click="tomakePhoneCall">
<view class="start_text">联系客服</view>
<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>
{{phone || '18938664545'}}
{{phone || ''}}
</view>
</view>
</view>
......@@ -66,7 +67,7 @@
<image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
</view>
<view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
<view @click="toProxyApplet()" v-if="list.is_open_manage == 1 && statusloading == 1"
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;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>运营</view>
......@@ -108,12 +109,16 @@
msg: null,
worksid: 1,
statusloading: null, //加载状态
phone: '18938664545',
phone: '',
goods: [], //商品列表
currentIndex: 0,
selectItem: null, //选择对象
name: "",
show_admin_login: 0
show_admin_login: 0,
globalData: {
typefacedata: [],
num: 0
},
};
},
......@@ -195,7 +200,7 @@
mask: true
})
uni.makePhoneCall({
phoneNumber: this.phone || '18938664545', //仅为示例
phoneNumber: this.phone || '', //仅为示例
success(res) {
uni.hideLoading();
},
......@@ -258,6 +263,15 @@
}else{
this.worksid = 100211
}
if(this.list.wx_flag == 1){
this.msg = "稍等片刻,我很快恢复"
this.myheadtext = '歇一歇' //头部标题栏
this.statusloading = 2
this.phone = this.list.shop.tel
uni.stopPullDownRefresh();
uni.hideLoading();
return;
}
this.toFirstCheck();
this.myheadtext = this.machine_id//头部标题栏
}
......@@ -326,6 +340,63 @@
this.statusloading = 1;
this.Adlist() //轮播图
this.getDetail() //获取数据
let url = "/api/material/mchineFontFamilyList";
let queryParam = {
machine_id: this.machine_id
}
var that = this;
this.$http.post(url, queryParam).then(result => {
var dataList = result.data;
dataList.forEach(item => {
item.long = false
item.textlong = null
})
dataList.unshift({
id: 0,
key: "SourceHanSansCN-Normal",
remark: "",
title: "思源黑体",
textlong: true,
long: true
})
this.globalData.typefacedata = dataList
this.$base.typefacedata = this.globalData.typefacedata
let t1 = new Date().getTime();
let that = this
this.globalData.typefacedata.forEach(textlist => {
uni.loadFontFace({
global: true,
family: textlist.title,
source: 'url(' + textlist.remark + ')',
desc: {
weight: 100
},
success: function(success) {
textlist.textlong = true
},
fail: function(fail) {
textlist.textlong = false
},
complete(res) {
//console.log("完成")
textlist.long = true
that.globalData.typefacedata.forEach(item => {
if (item.long == true) {
that.globalData.num++
}
})
that.$base.typefacedata = that.globalData.typefacedata
if (that.globalData.num == that.globalData.typefacedata.length) {
}
that.globalData.num = 0
}
})
})
}).catch(err => {
//uni.hideLoading();
});
},
onShow() {},
......
pages/index/mall.vue
......@@ -88,7 +88,6 @@
<view style="font-size: 36upx; font-weight: 500; color: #FFFFFF; opacity: 0.4;">
{{item.id}}
</view>
<view style="margin: 5upx 0 7upx; font-size: 32upx; font-weight: 500; color: #FFFFFF;
width: 80%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all;"
:style="{opacity:item.status.value == 1 || item.status.value == 2 ? '0.4' : '0.4'}">
......
pages/index/textsettings.vue
......@@ -27,7 +27,7 @@
<view
style="width: 601upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 21upx 41upx 21upx 21upx; border-radius: 10upx;">
<input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73"
:adjust-position="false" type="text" maxlength="20" @input="textInput"
:adjust-position="false" type="text" maxlength="35" @input="textInput"
v-model="data.currentText" @focus="focusTextarea" @blur="blurTextarea"
placeholder="请输入文字内容..."
style="font-size: 34upx; font-weight: 400; height: 57upx; line-height: 57upx; padding: 0upx 0 0upx 20upx; color: #FFFFFF;" />
......@@ -63,8 +63,8 @@
style="display: flex; height: 90upx; padding: 38upx 0 41upx; align-items: center;">
<!-- 颜色 开始-->
<scroll-view style="box-sizing: border-box; white-space: nowrap;
margin-left: 35upx; margin-right: 35upx;margin-bottom: 30upx; margin-top: 40upx; width: calc(100% - 70upx);"
<scroll-view style="box-sizing: border-box; white-space: nowrap; margin-left: 35upx;
margin-right: 35upx;margin-bottom: 30upx; margin-top: 40upx; width: calc(100% - 70upx);"
scroll-x scroll-with-animation>
<view style="text-align: center; display: inline-block; padding-left: 20upx;"
v-for="(item,index) in colorList" :key="index" @click.stop="workcolor(item.color)">
......@@ -87,12 +87,11 @@
</view>
<view v-if="!show" style="position: absolute; bottom: 100upx; width: 100%; background: #292933;">
<!-- 修改 -->
<view v-if="text == 'modify'" style="display: flex;align-items: center; justify-items: center; border-bottom: 1upx solid #000000;
height: 99upx;">
<view v-if="text == 'modify'" style="display: flex;align-items: center; justify-items: center; border-bottom: 1upx solid #000000;height: 99upx;">
<view
style="width: 710upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 20upx 40upx 20upx 20upx; border-radius: 10upx;">
<input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73"
:adjust-position="false" type="text" maxlength="32" @input="textInput"
:adjust-position="false" type="text" maxlength="35" @input="textInput"
v-model="data.currentText" @focus="focusTextarea" @blur="blurTextarea"
placeholder="请输入文字内容..."
style="font-size: 34upx; font-weight: 400; height: 57upx; line-height: 57upx; padding: 0upx 0 0upx 20upx; color: #FFFFFF;" />
......
util/script.js
......@@ -37,6 +37,14 @@ function callRecognizeBankCard(imageURL, miniProgramType, type, callback) {
request_["ImageURL"] = imageURL;
request_["Mode"] = "ln17_256";
request_["OutputFormat"] = "png";
}else if (type == 5) { //图像超分
request_["Url"] = imageURL;
Action = "MakeSuperResolutionImage";
endpoint = "imageenhan.cn-shanghai.aliyuncs.com";
API_VERSION = "2019-09-30";
request_["Mode"] = "enhancement";
request_["UpscaleFactor"] = "4";
request_["OutputQuality"] = "100";
} else {
request_["AlgoType"] = "handdrawn";
}
......
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