Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-miniapp-worker

config/dev.js

@@ -4,8 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.25:7080"',
-    // HOST: '"http://192.168.89.147:7080"',
-    HOST: '"https://machine.njyunzhi.com"',
+    HOST: '"http://192.168.89.147:7080"',
+    // HOST: '"https://machine.njyunzhi.com"',
     // OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
     // VERSION: '"3.0.3_2021-12-23"',
   },

project.config.json

@@ -39,7 +39,8 @@
         "minifyWXML": true,
         "showES6CompileOption": false,
         "useCompilerPlugins": false,
-        "ignoreUploadUnusedFiles": true,
+        "ignoreDevUnusedFiles": false,
+        "ignoreUploadUnusedFiles": false,
         "useStaticServer": true
     },
     "compileType": "miniprogram",

src/pages/index/components/User/index.jsx

@@ -49,7 +49,6 @@ export default (props) => {
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      {/* <View className='personTip'>该账号归{person.userName}所属</View> */}
       <View className='userHead' onClick={handleAccount}>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >

src/pages/userInfo/index.jsx

@@ -87,12 +87,6 @@ export default withLayout((props) => {
           <Image src={avatar} className='avatarImg' />
           <View className='change'>更换头像</View>
         </View>
-        {/* <View className='userCell'>
-          <View>用户名：</View>
-          <View style={{ display: 'flex', opacity: 0.5, alignItems: 'center', height: '54px' }}>
-            <Input type='text' value={person.userName} disabled className='userName' />
-          </View>
-        </View> */}
         <View className='userCell'>
           <View>姓名：</View>
           <View style={{ display: 'flex', alignItems: 'center', height: '54px' }}>