1

src/api/activity.js

-import request from '../utils/requestActivity.js'
+import request from '../utils/requestMall.js'
 
 /**
  * 获取活动类型列表

src/pages/activity/activityList.vue

@@ -218,7 +218,7 @@
               @click="select(x)"
               :style="{
                 color: x.Id == msg.ActivityType ? '#FFF' : '#666666',
-                background: x.Id == msg.ActivityType ? mainColor : '#F9F9F9',
+                background: x.Id == msg.ActivityType ? '#00ACF9' : '#F9F9F9',
               }"
             >
               {{ x.TypeName }}
@@ -271,17 +271,18 @@ export default {
     });
     let methods = {
       async getActivityType() {
-        let res = await getActivityTypeList();
+        let res = await getActivityTypeList({});
         if (res) {
+          console.log("mall", res);
           data.activityTypeList = res.data;
           data.activityTypeList.unshift({
             Id: 0,
             TypeName: "不限",
           });
-          this.msg.ActivityType = 0;
-          this.ActivityName = "不限";
+          data.msg.ActivityType = 0;
+          data.ActivityName = "不限";
         }
-        methods.getList();
+        // methods.getList();
       },
       async getList() {
         let res = await getActivityList(data.msg);
@@ -289,7 +290,7 @@ export default {
           let arr = methods.groupArr(res.data.pageData, "MonthStr");
           let arr2 = arr;
           if (data.msg.pageIndex === 1) {
-            this.g = [];
+            data.g = [];
           }
           if (data.g.length > 0) {
             arr2.forEach((x) => {

src/utils/requestMall.js

+//请求电商接口
+let host = ''
+if (process.env.NODE_ENV === "development") {
+	host = 'http://192.168.20.17:8014/api'
+} else {
+	// host = 'https://eduapi.oytour.com/api'
+}
+import Toast from '../wxcomponents/vant/toast/toast';
+let JHdata = uni.getStorageSync("userInfo");
+let request = (param) => {
+	//网络请求
+	return new Promise((resolve, reject) => {
+		let token = uni.getStorageSync('userInfo').Token;
+		uni.request({
+			url: host + param.url,
+			method: param.method || "Post",
+			header: param.header || {
+				'content-type': "application/json",
+				'token': token || ""
+			},
+			data: {
+				msg: param.data,
+				MallBaseId: parseInt(JHdata.JHMallBaseId),
+				UserId: JHdata.JHMallUserId,
+				TenantId: parseInt(JHdata.JHTenantId),
+				StudentId: JHdata.Id,
+				OpenId: JHdata.JHMallUserOpenId,
+				SmallShopsId: 0,
+				MiniAppId: "wx38e054ee42b054f4",
+				token: JHdata.MallToken
+			},
+			success: res => {
+				if (res.data.resultCode === 1) {
+					resolve(res.data)
+				} else {
+					Toast({
+						type: 'fail',
+						message: res.data.message,
+						onClose: () => {
+							if (res.data.resultCode === 10001 || res.data.resultCode === 10000) {
+								uni.reLaunch({
+									url: '/pages/login/login'
+								});
+							}
+						},
+					});
+				}
+			},
+			fail: (err) => {
+				console.warn("fail:" + JSON.stringify(err));
+				uni.showToast({
+					title: '网络请求失败',
+					duration: 2000,
+					icon: "error",
+				});
+			}
+		});
+	})
+}
+export default request