Merge remote-tracking branch 'refs/remotes/yudao/master'

# Conflicts:
#	pages/order/confirm.vue

sheep/api/member/social.js

@@ -49,6 +49,28 @@ const SocialApi = {
       },
     });
   },
+  // 获取订阅消息模板列表
+  getSubscribeTemplateList: () =>
+    request({
+      url: '/member/social-user/get-subscribe-template-list',
+      method: 'GET',
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    }),
+  // 获取微信小程序码
+  getWxaQrcode: async (path, query) => {
+    return await request({
+      url: '/member/social-user/wxa-qrcode',
+      method: 'POST',
+      data: {
+        scene: query,
+        path,
+        checkPath: false, // TODO 开发环境暂不检查 path 是否存在
+      },
+    });
+  },
 };
 
 export default SocialApi;

sheep/api/migration/third.js

@@ -1,34 +1,6 @@
 import request from '@/sheep/request';
 
 export default {
-  // 微信相关
-  wechat: {
-    // 小程序订阅消息
-    getSubscribeTemplateList: () =>
-      request({
-        url: '/member/social-user/get-subscribe-template-list',
-        method: 'GET',
-        custom: {
-          showError: false,
-          showLoading: false,
-        },
-      }),
-
-    // 获取微信小程序码
-    // TODO @puhui999：这个接口，挪到 /Users/yunai/Java/yudao-mall-uniapp/sheep/api/member/social.js
-    getWxacode: async (path, query) => {
-      return await request({
-        url: '/member/social-user/wxa-qrcode',
-        method: 'POST',
-        data: {
-          scene: query,
-          path,
-          checkPath: false, // TODO 开发环境暂不检查 path 是否存在
-        },
-      });
-    },
-  },
-
   // 苹果相关
   apple: {
     // 第三方登录