Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/services/common.js

@@ -1,4 +1,4 @@
-import { fetch } from '@/utils/request'
+import { fetch } from "@/utils/request";
 import {
   API_PRELOAD,
   API_QRCODE,
@@ -7,76 +7,84 @@ import {
   API_BURIED_POINT,
   API_CITY_LIST,
   API_TEMPLATE_TYPE,
-  API_INDEX_ICONS,
-} from '@/constants/api'
+  API_INDEX_ICONS
+} from "@/constants/api";
 
 /**
  * 预加载数据
  *  @param {*} payload
- * 
-*/
-export const getPreloadData = payload => fetch({ url: API_PRELOAD, payload, method: 'GET' })
+ *
+ */
+export const getPreloadData = payload =>
+  fetch({ url: API_PRELOAD, payload, method: "GET" });
 
 /**
  * 获取二维码
  *  @param {*} payload
- * 
-*/
-export const getMiniQrcode = payload => fetch({ url: API_QRCODE, payload, method: 'POST' })
+ *
+ */
+export const getMiniQrcode = payload =>
+  fetch({ url: API_QRCODE, payload, method: "POST" });
 
 /**
  * 获取二维码参数
  *  @param {*} scene
- * 
-*/
-export const getCodeScene = scene => fetch({ url: `${API_QUERY_CODE_SCENE}/${scene}` })
-
+ *
+ */
+export const getCodeScene = scene =>
+  fetch({ url: `${API_QUERY_CODE_SCENE}/${scene}` });
 
 /**
  * 获取banner列表
  *  @param {*} type 打开方式, 这里值为 banner(轮播图) 或者 screen(首屏广告)
- *  @param {*} payload 
- * 
- * 
-*/
-export const queryBanners = (type, payload) => fetch({ url: `${API_BANNER_LIST}/${type}`, payload })
+ *  @param {*} payload
+ *
+ *
+ */
+export const queryBanners = (type, payload) =>
+  fetch({ url: `${API_BANNER_LIST}/${type}`, payload });
 
 /**
  * 获取 banner , 首屏等一些信息
- * @param {*} payload 
+ * @param {*} payload
  */
-export const queryExtContents = payload => fetch({ url: API_BANNER_LIST, payload })
+export const queryExtContents = payload =>
+  fetch({ url: API_BANNER_LIST, payload });
 
 /**
  * 获取 首页图标
  * @param {*} payload
  */
-export const queryIndexIcons = payload => fetch({ url: API_INDEX_ICONS, payload })
+export const queryIndexIcons = payload =>
+  fetch({ url: API_INDEX_ICONS, payload });
 
 /**
  * 新增埋点
- * @param {*} payload 
+ * @param {*} payload
  */
-export const savePoint = (payload) => fetch({ url: API_BURIED_POINT, payload, method: 'POST' }, 2)
-
+export const savePoint = payload =>
+  fetch(
+    { url: API_BURIED_POINT, payload, method: "POST", showToast: false },
+    2
+  );
 
 /**
  * 更新埋点
- * @param {*} id 
+ * @param {*} id
  * @param {*} payload
  */
-export const updatePoint = (id, payload) => fetch({ url: `${API_BURIED_POINT}/${id}`, payload, method: 'PUT' }, 2)
-
+export const updatePoint = (id, payload) =>
+  fetch({ url: `${API_BURIED_POINT}/${id}`, payload, method: "PUT" }, 2);
 
 /**
  * 获取城市列表
- * @param {*} 
+ * @param {*}
  */
-export const queryCityList = () => fetch({ url: API_CITY_LIST })
-
+export const queryCityList = () => fetch({ url: API_CITY_LIST });
 
 /**
  * 获取消息模板
- * @param {*} 
+ * @param {*}
  */
-export const queryMessageTPL = type => fetch({ url: `${API_TEMPLATE_TYPE}/${type}` })
+export const queryMessageTPL = type =>
+  fetch({ url: `${API_TEMPLATE_TYPE}/${type}` });

yarn.lock

@@ -265,10 +265,10 @@
     node-sass "^4.12.0"
     scss-bundle "^2.5.1"
 
-"@tarojs/plugin-sass@^1.3.25":
-  version "1.3.42"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.42.tgz?cache=0&sync_timestamp=1587869865097&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-sass%2Fdownload%2F%40tarojs%2Fplugin-sass-1.3.42.tgz#56cb31582ba71946450a3daeed3447c9dd3b4ae6"
-  integrity sha1-VssxWCunGUZFCj2u7TRHyd07SuY=
+"@tarojs/plugin-sass@^2.1.5":
+  version "2.2.6"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-2.2.6.tgz#39aaa1abe25eb77362f47316aa46568b550507e2"
+  integrity sha1-Oaqhq+Jet3Ni9HMWqkZWi1UFB+I=
   dependencies:
     node-sass "^4.12.0"
     scss-bundle "^2.5.1"