修改经典装修

@@ -13,7 +13,7 @@ const back = require(cRoot + '/back');
 const bind = require(cRoot + '/bind');
 const bind = require(cRoot + '/bind');
 const reg = require(cRoot + '/reg');
 const reg = require(cRoot + '/reg');
 
 
-// const smsLogin = require(cRoot + '/sms');
+const smsLogin = require(cRoot + '/sms');
 const update = require(cRoot + '/update');
 const update = require(cRoot + '/update');
 const agreement = require(cRoot + '/app-agreement');
 const agreement = require(cRoot + '/app-agreement');
 
 

@@ -527,7 +527,7 @@ const getShopData = (req, shopId, uid, isApp) => {
             return Promise.all([
             return Promise.all([
                 searchModel.getFilterSearchData({
                 searchModel.getFilterSearchData({
                     shop_id: shopId,
                     shop_id: shopId,
-                    type: 'default',//默认
+                    type: 'default', // 默认
                     brand: brandData.join(','),
                     brand: brandData.join(','),
                     order: '0',
                     order: '0',
                     channel: channel
                     channel: channel

@@ -16,15 +16,15 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',
     domains: {
     domains: {
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // liveApi: 'http://api.live.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/'
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
+        liveApi: 'http://api.live.yoho.cn/',
+        singleApi: 'http://single.yoho.cn/'
 
 
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        liveApi: 'http://testapi.live.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/'
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // liveApi: 'http://testapi.live.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/'
 
 
         // favApi: 'http://192.168.102.31:8092/brower',
         // favApi: 'http://192.168.102.31:8092/brower',
         // api: 'http://192.168.102.205:8080/gateway/',
         // api: 'http://192.168.102.205:8080/gateway/',

@@ -99,39 +99,6 @@ $btnSure.on('touchstart', function() {
     if (!validatePWD(pwd)) {
     if (!validatePWD(pwd)) {
         showErrTip('密码6-20位，请重新输入');
         showErrTip('密码6-20位，请重新输入');
     } else {
     } else {
-<<<<<<< HEAD
-        $.ajax({
-            type: 'POST',
-            url: '/passport/reg/setpassword',
-            data: {
-                password: pwd,
-                phoneNum: $('#phone-num').val(),
-                areaCode: $('#area-code').val(),
-                token: $('#token').val()
-            },
-            success: function(data) {
-                var res = data.data;
-
-                if (data.code === 200) {
-                    // 统计代码：用于统计从哪个渠道注册成功的
-                    if (window._yas && window._yas.sendCustomInfo) {
-                        window._yas.sendCustomInfo({
-                            op: 'YB_REGISTER_SUCCESS_L',
-                            param: JSON.stringify({
-                                C_ID: window._ChannelVary[window.cookie('_Channel')] || 1,
-                                UNION_TYPE: window.queryString.union_type || window.cookie('unionTypeYas') || false
-                            })
-                        }, true);
-                    }
-                    showErrTip('注册成功');
-
-                    location.href = res.href;
-                } else {
-                    showErrTip(data.message);
-                }
-            }
-        });
-=======
         if ($('.pitch').hasClass('select')) {
         if ($('.pitch').hasClass('select')) {
             setPassword();
             setPassword();
         } else {
         } else {
@@ -149,7 +116,6 @@ $btnSure.on('touchstart', function() {
                 location.href = '//m.yohobuy.com/passport/agreement' + window.location.search + '&pwd=' + pwd;
                 location.href = '//m.yohobuy.com/passport/agreement' + window.location.search + '&pwd=' + pwd;
             });
             });
         }
         }
->>>>>>> release/5.2
     }
     }
 });
 });