提价

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

@@ -55,7 +55,7 @@ class Comnickpanel extends Component {
         this.setState({
           pass: false
         })
-        Toast('请输入正确昵称', 2000)
+        Toast('昵称中不可以输入标点、空格、emoji图案哦', 2000)
         setTimeout(() => {
           this.setState({
             pass: true

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

@@ -296,37 +296,51 @@ class Pagewishscene extends Component {
     * 场景开始开奖
     */
   async startOpenPrize() {
-    this.clickBuried(4)
-    let { chooseList, wishName, pass } = this.state;
-    console.log("许愿结果", chooseList);
-    let wishIds = chooseList.filter((item) => { return item != -1 }).map(item => { return item = +item + 1 }).join(',');
-    console.log('{{{{{{{{{', wishIds);
 
-    if (pass) {
-      this.setState({
-        pass: false
-      })
-      getPxToken(async token => {
-        let postObj = { token: "" };
-        postObj.token = token;
-        postObj.wishIds = wishIds;
-        if (chooseList.includes(-1) && wishName) {
-          postObj.userWishName = wishName;
-        }
-        console.log('/////////////', postObj);
-        let result = await API.getOpenPrize(postObj);
+    let str = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
+    let clean = /[\!|\~|\`|\#|\%|\^|\&|\*|\(|\)|\-|\_|\+|\=|\||\\|\{|\}|\;|\:|\"|\'|\,|\<|\.|\>|\/|\?/\，/\。/\；/\：/\“/\”/\》/\《/\|/\{/\}/\、/\!/\~/\`]/g;
+    // console.log(str2.test('1'), str2.test("a"), str2.test("安"), str2.test(","));
+    let { chooseList, wishName, pass } = this.state;
+    console.log(str.test(wishName.replace(clean, "")))
+    // return;
+    if (str.test(wishName.replace(clean, ""))) {
+      this.clickBuried(4)
+      console.log("许愿结果", chooseList);
+      let wishIds = chooseList.filter((item) => { return item != -1 }).map(item => { return item = +item + 1 }).join(',');
+      console.log('{{{{{{{{{', wishIds);
+      if (pass) {
         this.setState({
-          prizeResult: result
+          pass: false
         })
-        this.showLoading();
-      })
-      setTimeout(() => {
-        this.setState({
-          pass: true
+        getPxToken(async token => {
+          let postObj = { token: "" };
+          postObj.token = token;
+          postObj.wishIds = wishIds;
+          if (chooseList.includes(-1) && wishName) {
+            postObj.userWishName = wishName;
+          }
+          console.log('/////////////', postObj);
+          let result = await API.getOpenPrize(postObj);
+          this.setState({
+            prizeResult: result
+          })
+          this.showLoading();
         })
-      }, 2000)
+        setTimeout(() => {
+          this.setState({
+            pass: true
+          })
+        }, 2000)
+      }
+    } else {
+      if (pass) {
+        this.setState({ pass: false });
+        Toast('心愿中不可以输入空格、emoji图案哦', 2000);
+        setTimeout(() => {
+          this.setState({ pass: true });
+        }, 2000)
+      }
     }
-
   }
   jumpResultScene() {
     mHistory.push({ pathname: "/b" })

wishList/project/src/pages/pagewishscene/pagewishscene.less

@@ -136,18 +136,18 @@
 
     @keyframes clickTag {
       0% {
-        transform: scale(1);
+        // transform: scale(1);
         opacity: 0.9;
       }
 
       50% {
-        transform: scale(1.05);
+        // transform: scale(1.05);
         opacity: 1;
       }
 
       100% {
         opacity: 0.9;
-        transform: scale(1);
+        // transform: scale(1);
       }
     }
 

wishList/project/src/resconfig/resList.js

@@ -190,7 +190,7 @@ const resList = {
     name: 'wishBg',
     ext: '.png',
     uuid: '57172e95-f331-47b6-af37-9464c39ba69d',
-    url: '//yun.duiba.com.cn/spark/assets/1dae0d081ce845ca6e798a5691664e0b28507b39.png',
+    url: '//yun.duiba.com.cn/spark/assets/ad609efcc10dc89c16f82f9f624cb4530c0be32c.png',
   },
   'aa92b715-98a8-45e7-ad95-d0eef6ea1324': {
     name: 'shadow',