提交

src/api/SilkRoadSpringGala.js

@@ -14,7 +14,7 @@ export function getStore(data) {
   return ajax({
     url: "users/store",
     method: "POST",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -24,7 +24,7 @@ export function getDrawPlus(data) {
   return ajax({
     url: "users/draw-plus",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -34,8 +34,8 @@ export function getInfo(data) {
   return ajax({
     url: "users/info",
     method: "GET",
-	urlType: "slikRoad",
-	noToast: true, // 是否提示
+    urlType: "slikRoad",
+    noToast: true, // 是否提示
     data,
   });
 }
@@ -45,27 +45,30 @@ export function getSendVerifyCode(data) {
   return ajax({
     url: "users/sendVerifyCode",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
 
 // 验证验证码
 export function verifyCode(data) {
-    return ajax({
-      url: "users/verifyCode",
-      method: "GET",
-      urlType: "slikRoad",
-      data,
-    });
-  }
+  return ajax({
+    url: "users/verifyCode",
+    method: "GET",
+    urlType: "slikRoad",
+    data,
+  });
+}
 
 // 抽奖
 export function getDrawOri(data) {
   return ajax({
     url: "prize/draw",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
+    header:{
+        Authorization: localStorage.getItem("silkRoadToken") || "",
+    },
     data,
   });
 }
@@ -75,7 +78,7 @@ export function getUpdateOri(data) {
   return ajax({
     url: "users/update",
     method: "POST",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -85,7 +88,7 @@ export function getEnrollList(data) {
   return ajax({
     url: "enroll/list",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -95,7 +98,7 @@ export function getEnrollRank(data) {
   return ajax({
     url: "enroll/rank",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -105,7 +108,7 @@ export function getVote(data) {
   return ajax({
     url: "vote/vote",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }
@@ -115,7 +118,7 @@ export function getTimes(data) {
   return ajax({
     url: "vote/times",
     method: "GET",
-	urlType: "slikRoad",
+    urlType: "slikRoad",
     data,
   });
 }

src/utils/request.js

@@ -1,71 +1,74 @@
 import config from "../config/index.js";
-import {
-	showLoadingToast,
-	showToast,
-	closeToast
-} from "vant";
+import { showLoadingToast, showToast, closeToast } from "vant";
 import "vant/lib/toast/style/index";
 
 function getdata(data) {
-	let text = "";
-	for (const key in data) {
-		text += key + "=" + data[key] + "&";
-	}
-	text ? (text = "?" + text) : "";
-	text = text.replace(/&$/, "");
-	return text;
+  let text = "";
+  for (const key in data) {
+    text += key + "=" + data[key] + "&";
+  }
+  text ? (text = "?" + text) : "";
+  text = text.replace(/&$/, "");
+  return text;
 }
 
-export default function(ori) {
-	let baseurl = config.base[ori.urlType || "ajax"];
-	let url = baseurl + ori.url;
-	let isEnd = false;
-	let noToast = ori.noToast;
-	let time = setTimeout(() => {
-		clearTimeout(time);
-		!isEnd && !ori.noLoad && showLoadingToast({
-			message: '加载中...',
-			forbidClick: true,
-			duration: 0
-		});
-	}, 300);
-	return new Promise((resolve, reject) => {
-		var xhttp;
-		if (window.XMLHttpRequest) xhttp = new XMLHttpRequest();
-		else if (window.ActiveXObject)
-			xhttp = new window.ActiveXObject("Microsoft.XMLHTTP");
-		let method = ori.method.toUpperCase();
-		if (method === "GET") url += getdata(ori.data || {});
-		xhttp.open(method, url, true);
-		xhttp.setRequestHeader(
-			"Content-type",
-			ori.header ?
-			ori.header.contentType || "application/json" :
-			"application/json"
-		);
-		method === "GET" ? xhttp.send() : xhttp.send(JSON.stringify(ori.data));
-		xhttp.onreadystatechange = function() {
-			if (this.readyState != 4) return;
-			isEnd = true;
-			closeToast();
-			if (this.status != 200) {
-				let t = JSON.parse(this.responseText || "{}");
-				!noToast && showToast(t.message || "请求失败 " + this.status);
-				reject(t);
-				return;
-			}
-			let data = {};
-			try {
-				data =
-					this.responseText !== "null" ?
-					JSON.parse(this.responseText || "{}") : {};
-			} catch (err) {
-				!noToast && showToast("请求失败");
-				console.error(err);
-				reject(err);
-			}
-			if (data.code === 0) resolve(data.data);
-			else reject(data);
-		};
-	});
+export default function (ori) {
+  let baseurl = config.base[ori.urlType || "ajax"];
+  let url = baseurl + ori.url;
+  let isEnd = false;
+  let noToast = ori.noToast;
+  let time = setTimeout(() => {
+    clearTimeout(time);
+    !isEnd &&
+      !ori.noLoad &&
+      showLoadingToast({
+        message: "加载中...",
+        forbidClick: true,
+        duration: 0,
+      });
+  }, 300);
+  return new Promise((resolve, reject) => {
+    var xhttp;
+    if (window.XMLHttpRequest) xhttp = new XMLHttpRequest();
+    else if (window.ActiveXObject)
+      xhttp = new window.ActiveXObject("Microsoft.XMLHTTP");
+    let method = ori.method.toUpperCase();
+    if (method === "GET") url += getdata(ori.data || {});
+    xhttp.open(method, url, true);
+    xhttp.setRequestHeader(
+      "Content-type",
+      ori.header
+        ? ori.header.contentType || "application/json"
+        : "application/json"
+    );
+    xhttp.setRequestHeader(
+      "Authorization",
+      ori.header && ori.header.Authorization
+    );
+    method === "GET" ? xhttp.send() : xhttp.send(JSON.stringify(ori.data));
+    xhttp.onreadystatechange = function () {
+      if (this.readyState != 4) return;
+      isEnd = true;
+      closeToast();
+      if (this.status != 200) {
+        let t = JSON.parse(this.responseText || "{}");
+        !noToast && showToast(t.message || "请求失败 " + this.status);
+        reject(t);
+        return;
+      }
+      let data = {};
+      try {
+        data =
+          this.responseText !== "null"
+            ? JSON.parse(this.responseText || "{}")
+            : {};
+      } catch (err) {
+        !noToast && showToast("请求失败");
+        console.error(err);
+        reject(err);
+      }
+      if (data.code === 0) resolve(data.data);
+      else reject(data);
+    };
+  });
 }

src/view/SilkRoadShanShiPinList/index.vue

@@ -240,8 +240,10 @@ const config = reactive({
   isShanShiPin: window.$shanshipin.UserId,
 });
 const t = config.isShanShiPin ? 5 : 1;
-const phone = window.$shanshipin.Phone != 0 ? window.$shanshipin.Phone : localStorage.getItem("SilkRoadShanShiPinPhone") ||
-    "";
+const phone =
+window.$shanshipin.Phone && window.$shanshipin.Phone != 0
+    ? window.$shanshipin.Phone
+    : localStorage.getItem("SilkRoadShanShiPinPhone") || "";
 const login = reactive({
   phone,
   code: "",
@@ -302,8 +304,10 @@ const beforeClose = () => {
       phone: login.phone,
       code: login.code,
     })
-      .then(() => {
+      .then(r => {
+        console.log("1------>", r);
         localStorage.setItem("SilkRoadShanShiPinPhone", login.phone);
+        localStorage.setItem("silkRoadToken", r.token);
         return true;
       })
       .catch(() => false);

src/view/SilkRoadSpringFestivalGala/index.vue

@@ -87,7 +87,7 @@ document.title = "多彩丝路中国年 | 2023新年开运色";
  * window.$originData.orginParames.parameters 固定参数值
  * window.$originData.urlParames url参数
  */
-const page = ref("first");
+const page = ref("six");
 // let first_text = ['"大美中国·多彩丝路"', "2023丝路春晚 联名限定"];
 // for (let i = 0; i < first_text.length; i++) {
 //   first_text[i] = first_text[i].split("");

src/view/SilkRoadSpringFestivalGala/pages/eight.vue

@@ -93,7 +93,7 @@ function draw() {
   if (T) clearTimeout(T);
   T = setTimeout(() => {
     getDrawOri({
-      phone,
+      phone
     }).then(r => {
       let isdraw = r.prizeId !== 1; // 接入接口后直接由接口提供是否中将
       if (!isdraw)

src/view/SilkRoadSpringFestivalGala/pages/six.vue

@@ -311,10 +311,11 @@ function closeTitle(type) {
     phone: from.phone,
     verifyCode: from.code,
   })
-    .then(() => {
+    .then(r => {
       localStorage.setItem("silkRoadPhone", from.phone);
       localStorage.setItem("silkRoadCode", from.code);
       localStorage.setItem("silkRoadName", from.name);
+      localStorage.setItem("silkRoadToken", r.token);
       isCode.value = 0;
       showTitle.value = false;
       // 调用子组件抽奖