Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导选人load

project/package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "spark dev --type h5",
     "prod": "spark build --type h5 --env prod",
+    "build": "spark build --type h5 --env dev",
     "tb": "spark build --type taobao"
   },
   "dependencies": {

project/src/components/sign/sign.less

@@ -2,10 +2,8 @@
   width: 612px;
   height: 936px;
   left: 71px;
-  // top: 291px;
-
   top: 50%;
-  margin-top: -145px;
+  margin-top: -468px;
   position: absolute;
   .sign_bg {
     width: 609px;

project/src/components/userinfo/userinfo.jsx

@@ -16,10 +16,11 @@ class Userinfo extends Component {
   render() {
     return (
       <div className="userinfo " uuid="a9143822-c421-48d3-92c3-de9eafe5c234">
+        <input className="planame" type="text" placeholder="请输入昵称（不超过六字）" ref="planame" />
         <img
           className="userinfo_bg "
           uuid="cf852278-516f-48f3-bad2-0e38a1431c4e"
-          src={this.state.resList['868f4d36-e5ff-4bf9-9d7e-3c01ce4bb380'].url}
+          src="//yun.duiba.com.cn/spark/assets/abade6773357b20b6d7e25acfa6266feabee0c09.png"
         />
         <img
           className="userinfo_avatar "

project/src/components/userinfo/userinfo.less

@@ -2,8 +2,28 @@
   width: 514px;
   height: 555px;
   left: 121px;
-  top: 486px;
+  top: 50%;
   position: absolute;
+  margin-top:-277px;
+  .planame{
+    width: 380px;
+    height: 65px;
+    position: absolute;
+    top:275px;
+    left: 50px;
+    appearance: none;
+    font-size: 28px;
+    border-radius: 100px;
+    border: 0px solid #c8cccf;
+    color: #6a6f77;
+    outline: 0;
+    margin: auto;
+    text-align: center;
+    outline: 0;
+    padding: 0 10px;
+    text-decoration: none;
+    z-index: 1;
+  }
   .userinfo_bg {
     width: 509px;
     height: 459px;

project/src/pages/detail2/detail2.jsx

@@ -19,7 +19,7 @@ class Detail2 extends Component {
 
   render() {
     const arr = [];
-    for(let i=0; i < 10;i++) {
+    for(let i=0; i < 30;i++) {
       arr.push(i)
     }
     return (

project/src/pages/main3/main3.jsx

@@ -23,15 +23,38 @@ class Main3 extends Component {
     };
   }
 
+  onClick_userinfo = () => {
+    Aup.show('Userinfo', {}, this);
+    // console.log('onClick_signBtn')
+  }
+
+  onClick_signBtn = () => {
+    Aup.show('Sign', {}, this);
+    // console.log('onClick_signBtn')
+  }
+
+  onClick_shareBtn = () => {
+    console.log('onClick_shareBtn')
+  }
+
+  onClick_rulebtn = () => {
+    // console.log('onClick_rulebtn')
+    Aup.show('PopRule', {}, this)
+  }
+
+  onclick_jingcai = () => {
+    console.log('onclick_jingcai')
+  }
+
   componentDidMount() {
     this.initEvent();
-    if (this.props.data) {
-      setTimeout(() => {
-        // Aup.show('PopRule', {}, this)
-        // Aup.show('Userinfo', {}, this);
-        // Aup.show('Sign', {}, this); // Aup.show('Select', {}, this);
-      }, 200);
-    }
+    // if (this.props.data) {
+    //   setTimeout(() => {
+    //     // Aup.show('PopRule', {}, this)
+    //     // Aup.show('Userinfo', {}, this);
+    //     // Aup.show('Sign', {}, this); // Aup.show('Select', {}, this);
+    //   }, 200);
+    // }
   }
   initEvent() {
     GDispatcher.addEventListener(Store.homeinfo, this.freshHomeInfo, this);
@@ -457,7 +480,7 @@ class Main3 extends Component {
             <span className="main3_num " uuid="018875e0-9592-4854-ba0b-2cd58464a6a2">
               欢趣豆：12352
             </span>
-            <span className="main3_nick " uuid="a7518930-17cc-427a-a6e5-27a593b309c4">
+            <span onClick={this.onClick_userinfo} className="main3_nick " uuid="a7518930-17cc-427a-a6e5-27a593b309c4">
               用户昵称
             </span>
             <img
@@ -470,21 +493,25 @@ class Main3 extends Component {
             />
           </div>
           <img
+            onClick={this.onClick_signBtn}
             className="main3_sign "
             uuid="fdb364dd-23db-46fe-8ab4-df733ce0596b"
             src={this.state.resList['e4ba9074-781a-4dc1-a696-34753b57f924'].url}
           />
           <img
+            onClick={this.onClick_rulebtn}
             className="main3_rule "
             uuid="46338849-e102-41a8-9298-43639f634bcf"
             src={this.state.resList['98666530-5e40-49d7-8b86-8397e3ee0889'].url}
           />
           <img
+          onClick={this.onClick_shareBtn}
             className="main3_share "
             uuid="def4d721-bfe0-4c42-970c-40d99e1c2944"
             src={this.state.resList['82a28387-28f0-4e49-856a-dbe5e981bbb1'].url}
           />
           <img
+            onClick={this.onclick_jingcai}
             className="main3_btn_jingcai "
             uuid="de6b0150-9221-439d-adf7-ec3e3ad5466e"
             src={this.state.resList['8d1cc843-b298-42e1-a092-954edfcf93e2'].url}

project/src/pages/main3/main3.less

@@ -46,8 +46,7 @@
         position: absolute;
       }
       .main3_num {
-        width: 164px;
-        height: 22px;
+
         left: 105px;
         top: 57px;
         position: absolute;
@@ -55,8 +54,7 @@
         color: #ffffff;
       }
       .main3_nick {
-        width: 96px;
-        height: 24px;
+
         left: 105px;
         top: 20px;
         position: absolute;