1.5

pages/index/genHuiBen/index.vue

@@ -278,6 +278,10 @@
 				if (this.fileList1.length == 0) {
 					return this.$toast('请上传图片')
 				}
+				if (this.fileList1[0].status == 'uploading') {
+					return this.$toast('请等待图片上传完成')
+				}
+				// return console.log('picItem----------------', this.fileList1[0].status);
 				if (!this.formData.nickName) {
 					return this.$toast('请输入昵称')
 				}

pages/index/index.vue

@@ -192,7 +192,7 @@
 		},
 		methods: {
 			swiperChange(e) {
-				console.log('swiper---e', e);
+				// console.log('swiper---e', e);
 				this.currSwiperIndex = e.current
 			},
 			async getShare() {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

unpackage/dist/dev/mp-weixin/pages/index/genHuiBen/index.js

@@ -346,36 +346,42 @@ var _default = {
                 }
                 return _context2.abrupt("return", _this2.$toast('请上传图片'));
               case 5:
-                if (_this2.formData.nickName) {
+                if (!(_this2.fileList1[0].status == 'uploading')) {
                   _context2.next = 7;
                   break;
                 }
-                return _context2.abrupt("return", _this2.$toast('请输入昵称'));
+                return _context2.abrupt("return", _this2.$toast('请等待图片上传完成'));
               case 7:
-                if (_this2.formData.sex) {
+                if (_this2.formData.nickName) {
                   _context2.next = 9;
                   break;
                 }
-                return _context2.abrupt("return", _this2.$toast('请选择性别'));
+                return _context2.abrupt("return", _this2.$toast('请输入昵称'));
               case 9:
-                if (!(_this2.formData.age == -1)) {
+                if (_this2.formData.sex) {
                   _context2.next = 11;
                   break;
                 }
-                return _context2.abrupt("return", _this2.$toast('请选择年龄'));
+                return _context2.abrupt("return", _this2.$toast('请选择性别'));
               case 11:
-                if (_this2.formData.star) {
+                if (!(_this2.formData.age == -1)) {
                   _context2.next = 13;
                   break;
                 }
-                return _context2.abrupt("return", _this2.$toast('请选择星座'));
+                return _context2.abrupt("return", _this2.$toast('请选择年龄'));
               case 13:
-                if (!(_this2.formData.class == -1)) {
+                if (_this2.formData.star) {
                   _context2.next = 15;
                   break;
                 }
-                return _context2.abrupt("return", _this2.$toast('请选择班级'));
+                return _context2.abrupt("return", _this2.$toast('请选择星座'));
               case 15:
+                if (!(_this2.formData.class == -1)) {
+                  _context2.next = 17;
+                  break;
+                }
+                return _context2.abrupt("return", _this2.$toast('请选择班级'));
+              case 17:
                 p = {}; // 判断用户是否修改了角色信息
                 if (_this2.oldSeledRole) {
                   if (_this2.oldSeledRole.name != _this2.formData.nickName || _this2.oldSeledRole.star != _this2.formData.star || _this2.oldSeledRole.sex != _this2.formData.sex || _this2.oldSeledRole.age != _this2.formData.age || _this2.oldSeledRole.level != _this2.formData.class) {
@@ -401,9 +407,9 @@ var _default = {
                 }
 
                 // return console.log('p----------------', p);
-                _context2.next = 21;
+                _context2.next = 23;
                 return (0, _index.postTask)(p);
-              case 21:
+              case 23:
                 res1 = _context2.sent;
                 console.log('生成任务提交返回值--------2', res1);
                 if (res1.code == 0) {
@@ -416,7 +422,7 @@ var _default = {
                 } else {
                   _this2.$toast(res1.message);
                 }
-              case 24:
+              case 26:
               case "end":
                 return _context2.stop();
             }

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -290,7 +290,7 @@ var _default = {
   },
   methods: (_methods = {
     swiperChange: function swiperChange(e) {
-      console.log('swiper---e', e);
+      // console.log('swiper---e', e);
       this.currSwiperIndex = e.current;
     },
     getShare: function getShare() {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,8 +8,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "我的",
-          "pathName": "pages/my/index",
+          "name": "生成参数",
+          "pathName": "pages/index/genHuiBen/index",
           "query": "",
           "launchMode": "default",
           "scene": null