@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "type": "uniCloud",
+ "default": {
+ "launchtype": "local"
+ }
+ ]
+}
@@ -4,7 +4,7 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
// 网络接口修改此字符 小程序域名要求https
-let httpApi = '' //测试站
+let httpApi = 'http://zccy.liuniu946.com' //测试站
// let httpApi = 'http://192.168.31.50:8324' //本地
// let httpApi = 'https://mer.crmeb.net'
@@ -77,11 +77,25 @@
"usingComponents" : true
},
"mp-toutiao" : {
- "usingComponents" : true
+ "usingComponents" : true,
+ "appid" : "ttfd608bdd6258091d01",
+ "setting" : {
+ "urlCheck" : false
"h5" : {
"devServer" : {
- "https" : false
+ "https" : false,
+ "proxy" : {
+ "/api" : {
+ "target" : "https://zccy.liuniu946.com", //请求的目标域名
+ "changeOrigin" : true,
+ // "secure": false,
+ "pathRewrite" : {
+ // "^/api": "/"
"router" : {
"mode" : "history",
@@ -626,7 +626,10 @@
getGoodsDetails: function() {
uni.showLoading({
title: '加载中',
+ // #ifndef MP-TOUTIAO
mask: true
+ // #endif
+
});
let that = this;
getSeckillProductDetail(that.id).then(async res => {
@@ -398,7 +398,7 @@
getIndexData,
getCoupons
} from '@/api/api.js';
- // #ifdef MP-WEIXIN
+ // #ifdef MP
import {
getTemlIds,
@@ -484,7 +484,7 @@
countDownHour: "00",
countDownMinute: "00",
countDownSecond: "00",
- datatime: '',
+ // datatime: '',
ad: '',
userInfo: '',
loading: false,
@@ -536,14 +536,14 @@
}, {
pic: '/static/images/hot_003.png'
}],
- spikeList: [],
+ // spikeList: [],
bargList: [],
ProductNavindex: 0,
marTop: 0,
datatime: 0,
childID: 0,
loadend: false,
- loading: false,
+ // loading: false,
loadTitle: '加载更多',
sortProduct: [],
where: {
@@ -586,7 +586,7 @@
globalDatas: {},
mpHeight: 0,
currSpid: '',
- sortMarTop: 0,
+ // sortMarTop: 0,
mer_location: "",
share_title: ""
}
@@ -641,7 +641,9 @@
try {
uni.setStorageSync('user_latitude', res.latitude);
uni.setStorageSync('user_longitude', res.longitude);
- } catch {}
+ } catch(res) {
+ console.log(res)
@@ -663,7 +665,7 @@
this.getCombinationProduct(), this.getPresellProduct(), this.getAssistProduct(), this.getAssistUserCount(),
]);
// #ifdef MP
- this.getLiveList()
+ this.getLiveLists()
// #endif
if (this.isLogin) {
this.getUserInfo();
@@ -834,7 +836,7 @@
// 直播
- getLiveList() {
+ getLiveLists() {
getLiveList({
limit: 10