提交

wishList/project/mock/common/interface.js

@@ -2,7 +2,7 @@ import { Random } from 'mockjs';
 
 export const rule = {
   "success": true,
-  "data": `活动规则: 123121312312`
+  "data": `活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312活动规则: 123121312312`
 };
 /**
  * 首页接口

wishList/project/public/index.html

@@ -51,6 +51,7 @@
 
     var CFG = CFG || {};
     CFG.projectId = location.pathname.split('/')[2] || '1';
+    CFG.recordUrl = location.origin + "/projectx/" + CFG.projectId + "/f6b7a6ee3.html"
 
     function getUrlParam(name) {
       const search = window.location.search;

wishList/project/src/components/comnickpanel/comnickpanel.jsx

@@ -7,7 +7,7 @@ import { getPxToken } from '../../libs/spark_gettoken';
 import './comnickpanel.less';
 import { getModalHoc, Toast } from 'spark-design';
 import { ERROR_MESSSAGE } from '../../constant';
-
+import { mHistory } from '../../BaseRouter.jsx';
 class Comnickpanel extends Component {
   constructor(props) {
     super(props);
@@ -32,7 +32,7 @@ class Comnickpanel extends Component {
         let { success, message, data, code } = await API.saveNickName({ token: token, nickName: nickName });
         if (success) {
           console.log('接口调用成功', nickName);
-          onClose();
+          onClose(true);
         } else {
           Toast(ERROR_MESSSAGE(code))
         }
@@ -50,6 +50,8 @@ class Comnickpanel extends Component {
     })
   }
 
+
+
   render() {
     let { onClose } = this.props;
     let { nickName } = this.state;
@@ -58,7 +60,7 @@ class Comnickpanel extends Component {
         <div className="nickmodal ">
           <img className="nickShadow"></img>
           <img className="nicktitle " src={this.state.resList['18aff2cc-0e6d-4445-9ec6-d303d6539e26'].url} />
-          <img className="closebtn " onClick={onClose} src={this.state.resList['012e2a83-6e78-4f10-9ea7-c26dab7cb711'].url} />
+          <img className="closebtn " onClick={() => { onClose(false) }} src={this.state.resList['012e2a83-6e78-4f10-9ea7-c26dab7cb711'].url} />
           <img
             className="kai_shi_chuang_jian_huan_qi point3"
             onClick={() => { this.postNickname(nickName) }}

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

@@ -30,7 +30,7 @@ class Comprizepanel extends Component {
           <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} />
           <span className="awarddesc ">您的心愿树已长成，快去看看吧~</span>
-          {/* <img className="awardclose " onClick={onClose} src={this.state.resList['ad393b2f-4146-4f93-83f8-9c76a933daff'].url} /> */}
+          <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} />
           <span className="prizename ">{`恭喜获得${data.prizeName}奖品` || '恭喜中奖!'}</span>
         </div>

wishList/project/src/components/comrulepanel/comrulepanel.less

@@ -62,6 +62,7 @@
       transform-origin: 0px 0px 0px;
       font-size: 28px;
       color: rgba(148, 76, 18, 1);
+      overflow: scroll;
     }
   }
 }
\ No newline at end of file

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

@@ -121,6 +121,20 @@ class Pagewishscene extends Component {
     netBuried.clickLog(i);
   }
 
+  backScene() {
+    mHistory.push({ pathname: '/' });
+  }
+
+  closeNickname(pass) {
+    if (pass) {
+      this.modalControl(MODAL_NAME.P_GUIDE);
+    }
+    else {
+      this.backScene();
+    }
+
+  }
+
 
   /**
    * 获取所有的许愿签
@@ -334,7 +348,7 @@ class Pagewishscene extends Component {
         </div>
         {modalType == MODAL_TYPE[MODAL_NAME.P_LOADING] && <LoadingModal time={loadingTime} onClose={() => { this.showOpenPrize() }}></LoadingModal>}
         {modalType == MODAL_TYPE[MODAL_NAME.P_GUIDE] && <GuideModal time={loadingTime} onClose={() => { this.closeGuidePanel() }}></GuideModal>}
-        {modalType == MODAL_TYPE[MODAL_NAME.P_NICK] && <NicknameModal time={loadingTime} onClose={() => { this.modalControl(MODAL_NAME.P_GUIDE); console.log('{{{{{{{{{'); }}></NicknameModal>}
+        {modalType == MODAL_TYPE[MODAL_NAME.P_NICK] && <NicknameModal time={loadingTime} onClose={(pass) => { this.closeNickname(pass); }}></NicknameModal>}
         {modalType == MODAL_TYPE[MODAL_NAME.P_PRIZE_OPEN] && <OpenPrize></OpenPrize>}
         {modalType == MODAL_TYPE[MODAL_NAME.P_PRIZE_RESULT] && <PrizePanel onClose={() => { this.modalControl(); this.jumpResultScene() }} data={prizeData}></PrizePanel>}
         {modalType == MODAL_TYPE[MODAL_NAME.P_PRIZE_REGRET] && <PrizeRegret onClose={() => { this.modalControl(); this.jumpResultScene() }} data={prizeData}></PrizeRegret>}