scg:login

www/webapp/scg/config/index.js

@@ -3,10 +3,10 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path');
-const psth = 'http://commontest.yiguanjia.me';
+const psth = 'http://common.yiguanjia.me';
 module.exports = {
   dev: {
-    
+
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
@@ -69,7 +69,7 @@ module.exports = {
       //   },
       // },
     },
-    
+
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
@@ -77,7 +77,7 @@ module.exports = {
     errorOverlay: true,
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-    
+
     // Use Eslint Loader?
     // If true, your code will be linted during bundling andF
     // linting errors and warnings will be shown in the console.
@@ -85,19 +85,19 @@ module.exports = {
     // If true, eslint errors and warnings will also be shown in the error overlay
     // in the browser.
     showEslintErrorsInOverlay: false,
-    
+
     /**
      * Source Maps
      */
-    
+
     // https://webpack.js.org/configuration/devtool/#development
     devtool: 'eval-source-map',
-    
+
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
     cacheBusting: true,
-    
+
     // CSS Sourcemaps off by default because relative paths are "buggy"
     // with this option, according to the CSS-Loader README
     // (https://github.com/webpack/css-loader#sourcemaps)
@@ -105,31 +105,31 @@ module.exports = {
     // just be aware of this issue when enabling this option.
     cssSourceMap: false,
   },
-  
+
   build: {
     // Template for index.html
     index: path.resolve(__dirname, '../asset/index.html'),
-    
+
     // Paths
     assetsRoot: path.resolve(__dirname, '../asset'),
     assetsSubDirectory: '',
     assetsPublicPath: '/webapp/scg/asset/',
-    
+
     /**
      * Source Maps
      */
-    
+
     productionSourceMap: true,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',
-    
+
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
-    
+
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
     // `npm run build --report`

www/webapp/scg/src/lib/userID.js

@@ -1,17 +1,17 @@
 export default function userId() {
-  const id = [
-      '57e245989f5160ca048b456f', // 余零雨
-      '57eb6d449f5160a6048b46f9', // 焦孟骁
-      '5befffbf9f5160c03c8b547b', // Sherry
-      '5befd8d19f5160c03c8b5478', // Koala
-      '5bef8e3e9f5160123e8b5451', // jjhuman
-      '57e237ea9f5160b6048b4568', // 陌上歌
-      '57e238929f5160d6048b456d', // .
-      '57e38f1b9f5160ac048b457d', // 塘下七武海-涛
-      '59e41443fb48a7552f8b459e', // 笨笨_8119619
-    ]
-  ;
-  return localStorage.getItem('wxUserID1') != null ? localStorage.getItem('wxUserID1') : id[7];
+  // const id = [
+  //   //     '5acb042a9f5160bc048b6b1b', // 余零雨
+  //   //     '57e245989f5160ca048b456f', // 余零雨
+  //   //     '57eb6d449f5160a6048b46f9', // 焦孟骁
+  //   //     '5befffbf9f5160c03c8b547b', // Sherry
+  //   //     '5befd8d19f5160c03c8b5478', // Koala
+  //   //     '5bef8e3e9f5160123e8b5451', // jjhuman
+  //   //     '57e237ea9f5160b6048b4568', // 陌上歌
+  //   //     '57e238929f5160d6048b456d', // .
+  //   //     '57e38f1b9f5160ac048b457d', // 塘下七武海-涛
+  //   //     '59e41443fb48a7552f8b459e', // 笨笨_8119619
+  //   //   ];
+  return localStorage.getItem('wxUserID1') != null ? localStorage.getItem('wxUserID1') : '5acb042a9f5160bc048b6b1b';
 }
 /*
 card: {

www/webapp/scg/src/store.js

@@ -45,11 +45,12 @@ export default new Vuex.Store({
         }
       })
       .then(() => {
-        if (self.userInfo.source === '建工' && self.userInfo.user_info.phone !== '' && self.userInfo.type === '微信') {
-          self.ifLogin = false;
-        } else {
-          self.ifLogin = true;
-        }
+        self.ifLogin = self.userInfo.isReg;
+        // if (self.userInfo.isReg === '建工' && self.userInfo.user_info.phone !== undefined && self.userInfo.type === '微信') {
+        //   self.ifLogin = false;
+        // } else {
+        //   self.ifLogin = true;
+        // }
       })
       .then(() => {
         // console.log('准备获取商品列表');

www/webapp/scg/src/views/address/position.vue

@@ -8,7 +8,7 @@
           <cube-button slot="append" :primary="true" @click="search">搜索</cube-button>
         </cube-input>
       </div>
-      <div class="position-wrapper border-top-1px">
+      <div class="position-wrapper border-top-1px">/Users/honghaitao/code/work/2-php/www/protected/config/yiguanjia_const.php
         <cube-scroll ref="scroll" :options="options">
           <div class="position border-bottom-1px" v-for="item in result" @click="callback(item)">
             <p>{{item.city}}&nbsp;&nbsp;{{item.district}}</p>