Compare commits

..

No commits in common. '0e250d8eaf92daae91a1eeb03bb184fe3aa30315' and '81c97c508694e02861f2228a26341dcef2fc736e' have entirely different histories.

  1. 5
      components/f-login/f-login.js
  2. 4
      components/f-login/f-login.vue
  3. 6
      ext.json
  4. 7
      manifest.json
  5. 2
      subPageA/components/sy-audio/utils/jweixin.js
  6. 21
      subPageC/Ai/index.vue
  7. 4
      subPageC/bookHomestay/bookHomestay.vue
  8. 4
      subPageC/bookShop/bookShop.vue
  9. 4
      subPageC/bookTicket/bookTicket.vue
  10. 5
      subPageC/order/order.vue
  11. 4
      subPageC/orderHomestay/orderList.vue
  12. 4
      subPageC/orderShop/orderList.vue

@ -6,11 +6,10 @@ import HttpConfig from '@/common/config'
function getPhoneInfo(info, successCallback, errCallback) {
let httpData = {}
// #ifdef MP-WEIXIN
// const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : uni.getAccountInfoSync();//创巨圆商户平台管理
const extConfig = uni.getAccountInfoSync().miniProgram;
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
console.log(extConfig,'获取appiod')
httpData = {
appId: extConfig.appId,
appId: extConfig.app_id,
code: info.code, //小程序code
iv: info.iv, //小程序加密算法的初始向量
encryptedData: info.encryptedData, //包括敏感数据在内的完整用户信息的加密数据

@ -105,8 +105,8 @@ export default {
// token
let phone = res.phone;
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
uni.login({
success: (ras) => {
HttpRequest.post(

@ -1,8 +1,8 @@
{
"extEnable": false,
"extEnable": true,
"extAppid": "wx43f2232676218ce3",
"directCommit": false,
"directCommit": true,
"ext": {
"appId": "wx43f2232676218ce3"
"app_id": "wx43f2232676218ce3"
}
}

@ -50,17 +50,14 @@
/* ios */
"ios" : {},
/* SDK */
"sdkConfigs" : {},
"splashscreen" : {
"androidStyle" : "common"
}
"sdkConfigs" : {}
}
},
/* */
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "wxc2531538ecd3f593",
"appid" : "wxdad89d17cba4bf1c",
"setting" : {
"urlCheck" : false,
"es6" : true,

File diff suppressed because one or more lines are too long

@ -107,7 +107,7 @@
//
islongPress: false,
timer: null, //
param: {
pageSize: 10,
pageNo: 1,
@ -117,7 +117,6 @@
openid: undefined,
appid: undefined,
},
nowUserId:null
}
},
onUnload() {
@ -151,8 +150,8 @@
userInfo.refreshToken = newRefreshToken;
store.commit('setUserInfo', userInfo)
this.Token = newAccessToken
this.nowUserId = response.data.userId
this.getUserInfo(response.data.userId)
this.connectWs()
})
.catch(error => {
store.commit('setUserInfo', null)
@ -167,7 +166,7 @@
})
});
}
},
created: function() {
const res = uni.getSystemInfoSync();
@ -184,8 +183,7 @@
"identity": this.generateRandomString(8),
"userId": userId
};
console.log('querUserInfo',this.querUserInfo)
this.connectWs()
console.log(this.querUserInfo)
},
// websocket
connectWs() {
@ -254,7 +252,7 @@
//
handlerMessage(data) {
let $this = this
if (Number(data.userId) == Number(this.querUserInfo.userId)) {
if (Number(data.userId) == Number(this.querUserInfo.userId)) {
if (data.identity == this.querUserInfo.identity) {
if (data.context !== null) {
this.list[this.list.length - 1].content += data.context
@ -304,8 +302,7 @@
//
sendMsg() {
const $this = this
console.log('$this.nowUserId',$this.nowUserId)
this.getUserInfo($this.nowUserId)
this.getUserInfo()
this.list.push({
content: this.content,
userType: 'friend',
@ -381,12 +378,12 @@
}
})
},
//
//
longpress() {
const $this = this
this.islongPress = true;
if (this.islongPress == true && this.inputDisabled == false) {
//
//
const _permission = 'scope.record'
uni.getSetting({
success: (res) => {
@ -762,4 +759,4 @@
.loading-dot:nth-child(3) {
animation-delay: 0.4s;
}
</style>
</style>

@ -158,8 +158,8 @@
orderSubmit() {
this.$refs.form.validate().then(res => {
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
var data = {
"hotelId": this.orderInfo.hotelId,

@ -119,8 +119,8 @@
orderSubmit() {
this.$refs.form.validate().then(res => {
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
console.log("|this.formData", this.formData, this.orderInfo)
var data = {

@ -1238,8 +1238,8 @@ export default {
}
// }
const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
const params = {
openid: userInfo.openid,
appid: appId,

@ -354,8 +354,9 @@ export default {
loadData(pageNo) {
let that = this
const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
console.log(uni.getExtConfigSync(), 'extConfigextConfigextConfig')
let appId = extConfig.app_id
let httpData = {
openid: userInfo.openid,

@ -165,8 +165,8 @@
loadData() {
// TODO: appId openId
const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
this.param.openid = userInfo.openid
this.param.appid = appId

@ -141,8 +141,8 @@ export default {
loadData() {
// TODO: appId openId
const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getAccountInfoSync().miniProgram;
let appId = extConfig.appId
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
this.param.openid = userInfo.openid
this.param.appid = appId
// this.param.openid = "oohzD5b7g4hNA1qJyAwlSA5H4NCY"

Loading…
Cancel
Save