提交 0d653794 authored 作者: 常超凡's avatar 常超凡

最新代码

上级 bb1ab9c7
...@@ -8,7 +8,7 @@ Page({ ...@@ -8,7 +8,7 @@ Page({
const values = 'fenggu' const values = 'fenggu'
wx.navigateTo({ wx.navigateTo({
// url: '../takePhoto/takePhoto' // url: '../takePhoto/takePhoto'
url: '/pages/cameraTakePhoto/cameraTakePhoto?param=' + values url: '/pages/fenggu/takephoto/takephoto?param=' + values
}) })
}, },
// 关闭遮罩层 // 关闭遮罩层
......
...@@ -14,7 +14,9 @@ Page({ ...@@ -14,7 +14,9 @@ Page({
onLoad(options) { onLoad(options) {
}, },
back(){
wx.navigateBack()
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<image src="/assets/fenggu/示例1.jpg" mode="widthFix" style="width: 100%;"/> <image src="/assets/fenggu/示例1.jpg" mode="widthFix" style="width: 100%;"/>
<image src="/assets/fenggu/示例2.jpg" mode="widthFix" style="width: 100%;"/> <image src="/assets/fenggu/示例2.jpg" mode="widthFix" style="width: 100%;"/>
<image src="/assets/fenggu/示例3.jpg" mode="widthFix" style="width: 100%;"/> <image src="/assets/fenggu/示例3.jpg" mode="widthFix" style="width: 100%;"/>
<image src="/assets/fenggu/示例4.jpg" mode="widthFix" style="width: 100%;"/> <image bindtap="back" src="/assets/fenggu/示例4.jpg" mode="widthFix" style="width: 100%;"/>
</view> </view>
\ No newline at end of file
...@@ -354,7 +354,7 @@ getBaseTakePhoto(){ ...@@ -354,7 +354,7 @@ getBaseTakePhoto(){
bigfileimage: res.tempImagePath, bigfileimage: res.tempImagePath,
stepIndex:2 stepIndex:2
}); });
wx.navigateTo({ wx.redirectTo({
url: '../../upload/upload?path=' + that.data.bigfileimage + '&char=0' url: '../../upload/upload?path=' + that.data.bigfileimage + '&char=0'
}); });
}, },
......
...@@ -7,10 +7,13 @@ ...@@ -7,10 +7,13 @@
</view> </view>
</view> </view>
<view class="photo" style="position: relative;background-color: black;"> <view class="photo" style="position: relative;background-color: black;">
<camera style="height: 100%;width: 100%;" flash="on" devic-position="back" frame-size="large"> <camera style="position: relative;z-index: 2; height: 100%;width: 100%;" flash="on" devic-position="back" frame-size="large">
</camera> </camera>
<!-- 拍照框(正方形) --> <!-- 拍照框(正方形) -->
<image src="/assets/fenggu/拍照框.png" mode="widthFix" class="focus"/> <view class="focus">
<image src="/assets/fenggu/拍照框.png" mode="widthFix" style="width: 100%;"/>
<view class="text">请将结构三维码放在拍照框内</view>
</view>
</view> </view>
<view class="bottom" style="height: 400rpx;align-items: center;"> <view class="bottom" style="height: 400rpx;align-items: center;">
<view class="tabs" bind:tap="tabChange" style="padding: 6rpx;background-color: black;"> <view class="tabs" bind:tap="tabChange" style="padding: 6rpx;background-color: black;">
...@@ -21,7 +24,7 @@ ...@@ -21,7 +24,7 @@
</view> </view>
<view style="position:fixed; top: 999999999px;"> <view style="visibility:hidden; position:fixed;">
<canvas canvas-id="myCanvas" style='width:{{frame.width}}px; height:{{frame.height}}px;'></canvas> <canvas canvas-id="myCanvas" style='width:{{frame.width}}px; height:{{frame.height}}px;'></canvas>
<image src="{{src}}" mode="widthFix" style='width: {{windowWidth}}px; height: {{windowWidth}}px;border: 1px solid red; '></image> <image src="{{src}}" mode="widthFix" style='width: {{windowWidth}}px; height: {{windowWidth}}px;border: 1px solid red; '></image>
</view> </view>
\ No newline at end of file
...@@ -14,10 +14,22 @@ ...@@ -14,10 +14,22 @@
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 400rpx; width: 300rpx;
z-index: 99999; z-index: 99999;
} }
.takephoto .focus .text {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
text-align: center;
width: 80%;
color: #fff;
font-size: 30rpx;
font-weight: 700;
}
/* .takephoto .focus { /* .takephoto .focus {
position: absolute; position: absolute;
top: 50%; top: 50%;
......
...@@ -27,7 +27,8 @@ Page({ ...@@ -27,7 +27,8 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(options,8888)
console.log(options.company,'999999')
// 使用正则表达式来匹配数字和字母 // 使用正则表达式来匹配数字和字母
var reg = /^[0-9a-zA-Z]+$/; var reg = /^[0-9a-zA-Z]+$/;
var fenggu = /^http:\/\/q.fg9.vip\/m\/q\/[0-9a-zA-Z]+$/; var fenggu = /^http:\/\/q.fg9.vip\/m\/q\/[0-9a-zA-Z]+$/;
...@@ -45,7 +46,7 @@ Page({ ...@@ -45,7 +46,7 @@ Page({
url:`/pages/anti/anti?cpid=${options.cpid}` url:`/pages/anti/anti?cpid=${options.cpid}`
}) })
} }
else if(fenggu.test(options.cpid) ){ else if(options.company == "fenggu"){
console.log('丰谷页面') console.log('丰谷页面')
wx.navigateTo({ wx.navigateTo({
url:'/pages/fenggu/AICheck/AICheck' url:'/pages/fenggu/AICheck/AICheck'
......
...@@ -906,7 +906,7 @@ Page({ ...@@ -906,7 +906,7 @@ Page({
} }
if(this.data.param ==='fenggu'){ if(this.data.param ==='fenggu'){
if (aiState === 1 ) { if (aiState === 1 ) {
wx.navigateTo({ wx.redirectTo({
url:`/pages/fenggu/success/success?time1${this.data.dtime || this.data.people_time}&time2=${this.data.people_replytime/1000 || this.data.datemill/1000}` url:`/pages/fenggu/success/success?time1${this.data.dtime || this.data.people_time}&time2=${this.data.people_replytime/1000 || this.data.datemill/1000}`
}) })
} else { } else {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"setting": { "setting": {
"compileHotReLoad": true, "compileHotReLoad": true,
"urlCheck": false, "urlCheck": false,
"bigPackageSizeSupport": false "bigPackageSizeSupport": true
}, },
"condition": { "condition": {
"miniprogram": { "miniprogram": {
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
{ {
"name": "", "name": "",
"pathName": "pages/index/index", "pathName": "pages/index/index",
"query": "cpid='EH013852089694401'", "query": "company=fenggu",
"launchMode": "default", "launchMode": "default",
"scene": null "scene": null
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论