提交

wishList/project/mock/common/interface.js

@@ -13,7 +13,7 @@ export const rule = {
 export const index = {
   "code": "",
   "data": {
-    "newHandFlg": false,
+    "newHandFlg": true,
     "nicknameFlg":true,
     "wishCountFlg": false
   },
@@ -99,7 +99,7 @@ export const myWishData = {
     "wishCountFlg": true,
     "nickName": "中奖昵称",
     "wishData": {
-      "blessing": "祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语祝福之语",
+      "blessing": "你的努力，正在帮你收集幸运；你的坚持，终将让你梦想成真！所有的祝福送给你，愿你拥有精彩人生！",
       "wishList": [
         { "wishId": "", "wishName": "祝福一号", "types": "" },
         { "wishId": "", "wishName": "祝福二号", "types": "" },

wishList/project/src/components/comguidepanel/comguidepanel.jsx

@@ -18,6 +18,7 @@ class Comguidepanel extends Component {
           <img className="guidebg " src={this.state.resList['7a698ace-ce6e-4602-9a87-6535e80c087a'].url} />
           <label className="guideLable">点击即可点亮心愿签哦</label>
           <img className="guidebtn " onClick={onClose} src={this.state.resList['c60ec7de-fe4e-4c4d-9038-f249b078c456'].url} />
+          <label className="guideLab">OK,知道啦</label>
           <img className="hand " src={this.state.resList['1d1f4740-ef77-4f46-a74b-d7fd786cb69f'].url} />
         </div>
       </div>

wishList/project/src/components/comguidepanel/comguidepanel.less

@@ -47,6 +47,19 @@
       transform-origin: 0px 0px 0px;
     }
 
+
+    .guideLab {
+      width: 300px;
+      height: 50px;
+      opacity: 1;
+      left: 295px;
+      top: 917px;
+      position: absolute;
+      color: #fbd9a7;
+      font-size: 32px;
+      pointer-events: none;
+    }
+
     .guidebtn {
       width: 286px;
       height: 78px;

wishList/project/src/components/comloadingscene/comloadingscene.jsx

@@ -37,7 +37,7 @@ class Comloadingscene extends Component {
           <img className="loadingbg " src={this.state.resList['ee411dfb-e92f-4316-a0bf-1abf0f877b04'].url} />
           <img className="loading " src={this.state.resList['938c373e-0e9f-4e03-a8e3-314cae5267fc'].url} />
         </div>
-        <span className="loadingdesc ">给点时间~您的许愿树正在成长哦～ 请先收好礼吧！</span>
+        <span className="loadingdesc ">给点时间~您的心愿树正在成长哦～ 请先收好礼吧！</span>
       </div>
     );
   }

wishList/project/src/components/comprizepanel/comprizepanel.jsx

@@ -29,6 +29,7 @@ class Comprizepanel extends Component {
           <img className="prizeShadow " />
           <img className="awardbg1 " src={this.state.resList['e73c12f5-eb68-48a5-bd3b-01ea3ae1881d'].url} />
           <img className="getawardbtn point5" onClick={() => { this.getPrize() }} src={this.state.resList['b8893125-a836-4af2-892b-b5b01fc56772'].url} />
+          <label className="getPrizeBtnLab">开心收下,去看心愿树</label>
           <label className="awarddesc ">可前往首页和结果页「我的奖品」查看已获得的奖品哦</label>
           <img className="awardclose " onClick={onClose} src={this.state.resList['ad393b2f-4146-4f93-83f8-9c76a933daff'].url} />
           <img className="img " src={data.icon || this.state.resList['32b67dd1-c9e3-4ff0-b5f5-243426b71e39'].url} />

wishList/project/src/components/comprizepanel/comprizepanel.less

@@ -45,6 +45,19 @@
       transform-origin: 0px 0px 0px;
     }
 
+    .getPrizeBtnLab {
+      width: 373px;
+      height: 102px;
+      opacity: 1;
+      left: 294px;
+      top: 975px;
+      position: absolute;
+      text-align: center;
+      font-size: 30px;
+      color: #fbd9a7;
+      transform-origin: 0px 0px 0px;
+    }
+
     .awarddesc {
       width: 750px;
       height: 38px;
@@ -78,7 +91,7 @@
       transform-origin: 0px 0px 0px;
     }
 
-    .prizename  {
+    .prizename {
       width: 420px;
       height: 46px;
       opacity: 1;

wishList/project/src/pages/pageresultscene/pageresultscene.jsx

@@ -148,7 +148,7 @@ class Pageresultscene extends Component {
         <img className="sharebtn point6" onClick={() => { this.shareMsg() }} src={this.state.resList['73f4c449-b3e1-4797-90ce-438b9ba415de'].url} />
         <div className="wishresult ">
           <img className="wishbg " src={this.state.resList['57172e95-f331-47b6-af37-9464c39ba69d'].url} />
-          {/* <img className="shareImg " src={this.state.resList['0dd921f7-14be-4900-b404-24574796ac07'].url} /> */}
+          <img className="shareImg " src={this.state.resList['0dd921f7-14be-4900-b404-24574796ac07'].url} />
           <div className="wishtags ">
             <div className="tag4 ">
               <img className="tagb4 " src={this.state.resList['805e70ea-e0b5-44b2-989d-9da28a9920ae'].url} />

wishList/project/src/pages/pageresultscene/pageresultscene.less

@@ -58,10 +58,10 @@
   }
 
   .shareImg {
-    width: 153px;
-    height: 153px;
-    top: 126vw;
-    left: 71.4vw;
+    width: 140px;
+    height: 140px;
+    top: 124vw;
+    left: 73vw;
     position: absolute;
     // background-color: green;
     // z-index: 1;
@@ -172,7 +172,7 @@
       position: absolute;
       overflow-y: scroll;
       transform-origin: 0px 0px 0px;
-      font-size: 27px;
+      font-size: 23px;
       color: rgba(148, 76, 18, 1);
     }
   }

wishList/project/src/pages/pagewishscene/pagewishscene.jsx

@@ -198,7 +198,6 @@ class Pagewishscene extends Component {
             this.setState({
               pass: true
             })
-
           }, 2000)
         }
       }
@@ -382,7 +381,7 @@ class Pagewishscene extends Component {
           {chooseList.length == 5
             &&
             <img className="wishbtn " id="startLoading" src={this.state.resList['f19f3428-2f8b-4aa3-afab-db779b616020'].url} onClick={() => { console.log("choose=====", chooseList, 'wishName', wishName || "null"); this.startOpenPrize() }} />}
-          <label className="wishbtnLab ">{`种下我的许愿树(${chooseList.length}/5)`}</label>
+          <label className="wishbtnLab ">{`种下我的心愿树(${chooseList.length}/5)`}</label>
           <div className="wishinputs ">
             <img className="wishinputbg " src={this.state.resList['4ef09ae1-195d-473e-8eaf-06eac70dd005'].url} />
             <input className="wishinput " value={wishName} id="inputWish" onChange={() => { this.onInputChangeValue(wishName) }} onClick={() => { this.onCheckInputValue("wish") }} maxLength={10} placeholder="还可以在这里输入心愿哦!(0/10)"></input>

wishList/project/src/resconfig/resList.js

@@ -118,7 +118,7 @@ const resList = {
     name: 'guideBtn',
     ext: '.png',
     uuid: 'c60ec7de-fe4e-4c4d-9038-f249b078c456',
-    url: '//yun.duiba.com.cn/spark/assets/d3bbf771ea2546496949378cc4b655a790b56bf8.png',
+    url: '//yun.duiba.com.cn/spark/assets/ff3603d4e087d4bdee8cc746e02e23ae1a5bd84c.png',
   },
   '1d1f4740-ef77-4f46-a74b-d7fd786cb69f': {
     name: 'hand',
@@ -214,7 +214,7 @@ const resList = {
     name: 'getAwardBtn',
     ext: '.png',
     uuid: 'b8893125-a836-4af2-892b-b5b01fc56772',
-    url: '//yun.duiba.com.cn/spark/assets/9ea90a79b05461e992fe12e3f52c4605df86ce1e.png',
+    url: '//yun.duiba.com.cn/spark/assets/279d7da05521aea1d45c4358aabbbb1e4ee144f1.png',
   },
   'ad393b2f-4146-4f93-83f8-9c76a933daff': {
     name: 'awardClose',
@@ -273,7 +273,7 @@ const resList = {
   '0dd921f7-14be-4900-b404-24574796ac07': {
     name: 'shareImg',
     ext: '.png',
-    url: '//yun.duiba.com.cn/spark/assets/4a5d78bb5fd428c35ab48241de33e28ad7e0d3aa.png',
+    url: '//yun.duiba.com.cn/spark/assets/01adcd1f6d1019b8c1e3c8db970e6da1f6a2f28a.jpeg',
     uuid: '0dd921f7-14be-4900-b404-24574796ac07'
   },
   'd80d731b-86f0-4c81-875a-6702d799dd40': {