diff --git a/pages/index/index.vue b/pages/index/index.vue
index d52bd3e..aeca67e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -769,8 +769,6 @@
url: "/subPageA/search/search",
});
},
-
-
},
};
diff --git a/static/test/ai-bg.png b/static/test/ai-bg.png
deleted file mode 100644
index 70f630e..0000000
Binary files a/static/test/ai-bg.png and /dev/null differ
diff --git a/static/test/ai-friend.png b/static/test/ai-friend.png
deleted file mode 100644
index 68669bc..0000000
Binary files a/static/test/ai-friend.png and /dev/null differ
diff --git a/static/test/ai-self.png b/static/test/ai-self.png
deleted file mode 100644
index 86815ad..0000000
Binary files a/static/test/ai-self.png and /dev/null differ
diff --git a/static/test/flower-bg.png b/static/test/flower-bg.png
deleted file mode 100644
index c6144b0..0000000
Binary files a/static/test/flower-bg.png and /dev/null differ
diff --git a/static/test/icon-back.png b/static/test/icon-back.png
deleted file mode 100644
index 85a1fb4..0000000
Binary files a/static/test/icon-back.png and /dev/null differ
diff --git a/static/test/icon-shop.png b/static/test/icon-shop.png
deleted file mode 100644
index f75ae3d..0000000
Binary files a/static/test/icon-shop.png and /dev/null differ
diff --git a/static/test/icon-text.png b/static/test/icon-text.png
deleted file mode 100644
index 4d5fd22..0000000
Binary files a/static/test/icon-text.png and /dev/null differ
diff --git a/static/test/icon-translate-down.png b/static/test/icon-translate-down.png
deleted file mode 100644
index ef642eb..0000000
Binary files a/static/test/icon-translate-down.png and /dev/null differ
diff --git a/static/test/icon-translate.png b/static/test/icon-translate.png
deleted file mode 100644
index 24746ef..0000000
Binary files a/static/test/icon-translate.png and /dev/null differ
diff --git a/static/test/icon-voice.png b/static/test/icon-voice.png
deleted file mode 100644
index a83e864..0000000
Binary files a/static/test/icon-voice.png and /dev/null differ
diff --git a/static/test/weather_cloudy.png b/static/test/weather_cloudy.png
deleted file mode 100644
index 6ba47c0..0000000
Binary files a/static/test/weather_cloudy.png and /dev/null differ
diff --git a/static/test/weather_rainy.png b/static/test/weather_rainy.png
deleted file mode 100644
index de7ba23..0000000
Binary files a/static/test/weather_rainy.png and /dev/null differ
diff --git a/static/test/weather_smog.png b/static/test/weather_smog.png
deleted file mode 100644
index c902edd..0000000
Binary files a/static/test/weather_smog.png and /dev/null differ
diff --git a/static/test/weather_snowy.png b/static/test/weather_snowy.png
deleted file mode 100644
index d6a4920..0000000
Binary files a/static/test/weather_snowy.png and /dev/null differ
diff --git a/static/test/weather_sunny.png b/static/test/weather_sunny.png
deleted file mode 100644
index 0d7c0df..0000000
Binary files a/static/test/weather_sunny.png and /dev/null differ
diff --git a/subPageA/shop/shopDetail/shopDetail.vue b/subPageA/shop/shopDetail/shopDetail.vue
index 9783723..235885e 100644
--- a/subPageA/shop/shopDetail/shopDetail.vue
+++ b/subPageA/shop/shopDetail/shopDetail.vue
@@ -31,8 +31,8 @@
-
-
+
+
立即购买
@@ -76,7 +76,7 @@
},
orderSubmit:function(){
/* this.judgeLogin((resa) => {
-
+
var data = {
openid: this.userInfo.openid,
shopId: this.info.id,
@@ -85,14 +85,14 @@
merchantId:this.info.merchantId,
merchantName:this.info.merchantName
};
-
+
const parame = {
- ...val,
+ ...val,
...data
}
-
+
const shop = encodeURIComponent(JSON.stringify(parame));
-
+
uni.navigateTo({
url: "/subPageC/bookShop/bookShop?shop=" + shop
});
@@ -174,10 +174,10 @@
width: 38rpx;
height: 38rpx;
- background: url('@/static/test/icon-shop.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-shop.png');
background-repeat: no-repeat;
background-position: center;
background-size: 38rpx;
}
}
-
\ No newline at end of file
+
diff --git a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
index 3de0b07..625ec63 100644
--- a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
+++ b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
@@ -122,6 +122,7 @@
inputValue: "",
luyinstart: true,
voicePath: "",
+ _recordAuth:null,
messageType: 'voice', // text 发送文本；voice 发送语音
recordStart: false,
draw: undefined,
@@ -295,6 +296,7 @@
},
//开启麦克风权限
authTips() {
+ const $this=this
uni.showModal({
title: '提示',
content: '您拒绝了麦克风权限，将导致功能不能正常使用，去设置权限？',
@@ -306,7 +308,7 @@
success: (res) => {
if (res.authSetting['scope.record']) {
console.log("已授权麦克风");
- this._recordAuth = true
+ $this._recordAuth = true
} else {
// 未授权
wx.showModal({
@@ -326,24 +328,29 @@
touchstart() {
this.threebut = false;
this.textbut = true;
+ const $this=this
//开始录音
const _permission = 'scope.record'
uni.getSetting({
success: (res) => {
+ console.log('res.authSetting',res,res.authSetting)
// 判断是否有相关权限属性
- if (res.authSetting.hasOwnProperty(_permission)) {
- // 属性存在，且为false，用户拒绝过权限
+ console.log('判断是否有相关权限属性',res.authSetting.hasOwnProperty('scope.record'))
+ if (res.authSetting.hasOwnProperty('scope.record')) {
+ // 属性存在，且为false，用户拒绝过权限
+ console.log('属性存在，且为false，用户拒绝过权限',res.authSetting[_permission])
+
if (!res.authSetting[_permission]) {
- this.authTips()
+ $this.authTips()
} else {
// 已授权
- this._recordAuth = true
+ $this._recordAuth = true
// 开始录音
recorderManager.start({
format: 'pcm',
})
recorderManager.onStart(() => {
- this.recordStart = true
+ $this.recordStart = true
})
// 错误回调
@@ -353,18 +360,21 @@
icon: 'none',
title: '系统出错，请重试'
})
- this.recordStart = false
+ $this.recordStart = false
})
}
} else {
// 属性不存在，需要授权
+ console.log('属性不存在，需要授权')
uni.authorize({
- scope: _permission,
+ scope: 'scope.record',
success: () => {
// 授权成功
- this._recordAuth = true
+ $this._recordAuth = true
+ console.log('授权成功')
},
fail: (res) => {
+ console.log('// 未授权隐私协议',res.errno)
/**
* 104 未授权隐私协议
* 用户可能拒绝官方隐私授权弹窗，为了避免过度弹窗打扰用户，开发者再次调用隐私相关接口时，
@@ -380,7 +390,8 @@
})
} else {
// 用户拒绝授权
- this.authTips()
+ console.log('// 用户拒绝授权')
+ $this.authTips()
}
}
})
@@ -399,7 +410,7 @@
duration,
tempFilePath
} = res
- this.recordStart = false
+ $this.recordStart = false
wx.uploadFile({
url: $this.rootPath + '/app-api/wechatshop/toolIdentify/identifySpeech',
@@ -410,19 +421,28 @@
},
success: function(res) {
let data = JSON.parse(res.data)
+ if(data.data){
+ $this.messages.push({
+ type: "user",
+ typestyle: "dly_flex_c2 right_dig m-item me",
+ time: $this.$util.getCurrentTime3(),
+ headurl: "",
+ content: [{
+ text: data.data
+ }],
+ contentstyle: "jqr_box"
+ })
+ $this.getSelectMsg(data.data, "", 1);
+ $this.scrollToBottom();
+ }else{
+ wx.showModal({
+ title: '提示',
+ content: "没听清，请您再说一遍",
+ showCancel: false,
+ success: function(res) {}
+ });
+ }
- $this.messages.push({
- type: "user",
- typestyle: "dly_flex_c2 right_dig m-item me",
- time: $this.$util.getCurrentTime3(),
- headurl: "",
- content: [{
- text: data.data
- }],
- contentstyle: "jqr_box"
- })
- $this.getSelectMsg(data.data, "", 1);
- $this.scrollToBottom();
},
fail: function(res) {
UTIL.log(res);
diff --git a/subPageC/Ai/index.vue b/subPageC/Ai/index.vue
index 60258c0..f92cf68 100644
--- a/subPageC/Ai/index.vue
+++ b/subPageC/Ai/index.vue
@@ -6,7 +6,7 @@
-
+
E鹿小助手
{{item.content}}
@@ -15,7 +15,7 @@
v-if="item.userType=='friend'">
{{item.content}}
-
+
@@ -24,13 +24,13 @@
-
-
+
{{ recordStart ? '松开 发送' : '按住 说话' }}
@@ -75,13 +75,13 @@
clientTimer: null, // 客户端计时
clientTime: 10000, // 客户端计时间隔
serverTimer: null, // 服务端计时
- serverTime: 30000, // 服务端计时间隔
+ serverTime: 30000, // 服务端计时间隔
}
}
},
-
+
onShow() {
- const userInfo = uni.getStorageSync("userInfo");
+ const userInfo = uni.getStorageSync("userInfo");
this.userInfo = {
"message": "",
"dialogId": "",
@@ -381,7 +381,7 @@
}
.v-pages.Ai {
- // background: url('@/static/test/ai-bg.png');
+ // background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/ai-bg.png');
// background-repeat: no-repeat;
// background-position: top;
// background-size: cover;
@@ -533,4 +533,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/subPageC/flower/index.vue b/subPageC/flower/index.vue
index cdbbe1c..f5950e9 100644
--- a/subPageC/flower/index.vue
+++ b/subPageC/flower/index.vue
@@ -18,7 +18,7 @@
style="position: fixed; bottom: 0;left: 0; width: 100%;background-color: #fff;">
{{search_result[0].name}}
-
+
{{ActiveFrom.label}}
-
+
-
+
{{ActiveTo.label}}
-
+
@@ -233,9 +233,9 @@
from: this.ActiveTo.value,
to: this.ActiveFrom.value,
}
- }
+ }
this.$Request.get(this.$config.getTtranslate, queryParams, "", "", false, true)
- .then(res => {
+ .then(res => {
if (res.data !== null) {
this.resultText = res.data
} else {
@@ -380,4 +380,4 @@
.v-translate-box {
margin-top: 40rpx;
}
-
\ No newline at end of file
+
diff --git a/subPageC/weather/index.vue b/subPageC/weather/index.vue
index b8c91a0..7cadb77 100644
--- a/subPageC/weather/index.vue
+++ b/subPageC/weather/index.vue
@@ -203,31 +203,31 @@
height: 100vh;
&.sunny {
- background: url('@/static/test/weather_sunny.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/weather_sunny.png');
background-repeat: no-repeat;
background-size: contain;
}
&.cloudy {
- background: url('@/static/test/weather_cloudy.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/weather_cloudy.png');
background-repeat: no-repeat;
background-size: contain;
}
&.rainy {
- background: url('@/static/test/weather_rainy.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/weather_rainy.png');
background-repeat: no-repeat;
background-size: contain;
}
&.smog {
- background: url('@/static/test/weather_smog.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/weather_smog.png');
background-repeat: no-repeat;
background-size: contain;
}
&.snowy {
- background: url('@/static/test/weather_snowy.png');
+ background: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/weather_snowy.png');
background-repeat: no-repeat;
background-size: contain;
}
@@ -372,4 +372,4 @@
}
}
}
-
\ No newline at end of file
+