逻辑修改

This commit is contained in:
jia 2023-09-27 12:10:39 +08:00
parent c507002424
commit 805b194fe8
6 changed files with 40 additions and 34 deletions

View File

@ -7,7 +7,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
import request from "@/utils/requesta.js";
/** 获取话题分类*/
export function getTopicList() {
@ -83,7 +83,9 @@ export function videoList(data) {
}
/**自己的视频列表*/
export function deoList(id) {
return request.get(`community/show/${id}`);
return request.get(`community/show/${id}`, {
noAuth: true
});
}
export function myVideoList(id,data) {

View File

@ -1,4 +1,5 @@
import request from "@/utils/request.js";
import requestb from "@/utils/requestb.js";
/**
* 扫码查询商品
@ -578,8 +579,7 @@ export function vicinityStoreApi(data) {
商家入驻 -- 获取商户入驻申请协议内容
*/
export function agreeiness(data) {
return request.get(`business/agree`, data, { noAuth: true });
}
return request.get(`business/agree`, data, {
noAuth: true
});
}

View File

@ -9,8 +9,8 @@ let httpApiThree
let httpApiFour
// 在打包之前请检查当前环境是否正确
// const env = 'dev'; // 开发
const env = 'prod'; // 生产
const env = 'dev'; // 开发
// const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
switch (env) {

View File

@ -62,6 +62,9 @@
serviceList,
serviceUserList
} from "@/api/user";
import {
getUserInfo
} from '@/api/user.js';
import { mapGetters } from "vuex";
export default {
name: "CustomerList",
@ -88,13 +91,9 @@
computed: mapGetters(['isLogin','viewColor']),
onLoad(optios) {
this.type = optios.type;
this.mer_id = optios.mer_id;
if(this.isLogin){
this.getList(this.mer_id)
} else {
this.isAuto = true;
this.isShowAuth = true
}
this.getindex()
},
onShow(option) {
if(this.isLogin){
@ -119,6 +118,21 @@
this.clear = true;
},
methods: {
//
getindex(){
getUserInfo().then(res => {
this.mer_id = res.data.service.mer_id;
if(this.isLogin){
this.getList(this.mer_id)
} else {
this.isAuto = true;
this.isShowAuth = true
}
// this.getList(this.mer_id)
// this.getList(res.data.service.mer_id, true);
});
},
onLoadFun() {
this.isShowAuth = false;
this.getList(this.mer_id);
@ -217,7 +231,7 @@
},
};
</script>
<style lang="scss">
<style lang="scss" scoped>
.CustomerList {
.spin {
display: block;

View File

@ -333,7 +333,7 @@
//
itemTap(item) {
if (this.userid) {
if (item.video_link.length > 0) {
uni.navigateTo({
// #ifdef MP || H5
@ -348,11 +348,7 @@
url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
})
}
} else {
this.isAuto = true;
this.isShowAuth = true
}
},
//
authColse: function(e) {

View File

@ -670,7 +670,7 @@
type: 3,
statusBarHeight: 0,
isLihaiYun: '',
business_status: 0
}
},
computed: {
@ -760,8 +760,8 @@
}
}
// #endif
this.userinfo()
this.getStore();
this.diyData();
@ -818,13 +818,7 @@
},
methods: {
userinfo() {
getUserInfo().then(res => {
this.business_status = res.data.mer_info.setting_status
this.getStore();
})
},
getProductSpu() {
let that = this;
if (that.loadend) return;
@ -1012,7 +1006,7 @@
// this.service_open = false
// }
if (this.business_status == 1) {
if (res.data.business_status == 2) {
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
} else {
this.tabs = this.tabs5