nyx weapp: 控制流

1. 为order页面和活动提交页面添加空值提醒

nyx weapp: 控制流
1. 为order页面和活动提交页面添加空值提醒
a4f534de · jscat · 8c84e0d3 · a4f534de · a4f534de · a4f534de
Commit a4f534de authored Sep 16, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/app.js
+++ b/增值产品-小程序及app/nyx-master/app.js
 //app.js
@@ -10,16 +10,16 @@ App({
    authStatus: "", //授权状态, 00表示未授权, 01表示已授权
    userInfo : {}, //用户信息
    members : [], // 商家列表
-    memberInfo: {},
+    memberInfo: { // 商家信息
-      // member_id: "",
+      member_id: "",
-      // address_id: "",
+      address_id: "",
-      // default_member: "",
+      default_member: "",
-      // member_name: "",
+      member_name: "",
-      // member_city: "",
+      member_city: "",
-      // member_address: "",
+      member_address: "",
-      // member_slogan: "",
+      member_slogan: "",
-      // member_logo: "",
+      member_logo: "",
-    //}, // 商家信息
+    },
    emotionHost : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/emoji/",
    onOpenOp : {},

--- a/增值产品-小程序及app/nyx-master/pages/mall/order/order.js
+++ b/增值产品-小程序及app/nyx-master/pages/mall/order/order.js
 // pages/my/my-orders/my-orders.js
@@ -24,6 +24,9 @@ Page({
    curIndex: 0,
    selected_all : 0,
+    // 消息提示框的遮罩层
+    showToast: false,
  },
  /**
@@ -388,9 +391,36 @@ Page({
  //跳转到首页
  toHome: function (e) {
-    wx.switchTab({
+    var _this = this;
-      url: "/pages/activity/activity"
+    // jscat 20200913 消息提示框
-   });
+    /* 
+      需求:                                         
+      1, 消息提示
+      2, 延迟3000ms
+      3, 遮罩层
+    */
+   var showToast = true
+   _this.setData({ showToast })
+    wx.showToast({
+      icon: 'none',
+      title: '预订成功',
+      duration: 3000,
+      success: function(){
+        setTimeout(function(){
+          wx.switchTab({
+            url: '/pages/activity/activity',
+            success: function (e) {      
+              var page = getCurrentPages().pop(); 
+              if (page == undefined || page == null) return; 
+              // 更新首页的数据
+              console.log("===switchTab page", page)
+            } 
+          });
+        }, 3000)
+      }
+    })
  },

--- a/增值产品-小程序及app/nyx-master/pages/mall/order/order.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/mall/order/order.wxml
 <view class="page"> 
 <view class="page"> 
+    <!-- 定义遮罩层 -->
+    <view class="mask" wx:if="{{showToast}}"></view>
  <!-- Content: refer to 有品·优惠券 + 点评(可使用) -->
  <view class="coupon-list">
    <view class="item stamp stamp01" style="height:{{orderInfo.item_height}}rpx;">

--- a/增值产品-小程序及app/nyx-master/pages/mall/order/order.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/mall/order/order.wxss
 .page{
@@ -459,4 +459,16 @@
 .stepper .disabled{  
  color: #ccc;  
 }
 /* end of 数量加减 */
\ No newline at end of file
+  /* 消息提示框的遮罩层 */
+  .mask{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000;
+    z-index: 9000;
+    opacity: 0.5;
+  }
\ No newline at end of file
--- a/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.js
 // pages/member/activity-post/activity-edit/activity-edit.js
@@ -97,17 +97,20 @@ Page({
    var product = _this.__data__.products
    app.globalData.postData.photoProduct = _this.__data__.products
-    let promise = app.onCheckText(app.globalData.postData.photoTag)
+    if(checkField())
-    //在本轮event loop（事件循环）运行完成之前，回调函数是不会被调用的
+    {
-    //then后的括号里应该是参数param
+      let promise = app.onCheckText(app.globalData.postData.photoTag)
-    //https://www.cnblogs.com/qlongbg/p/11603328.html
+      //在本轮event loop（事件循环）运行完成之前，回调函数是不会被调用的
-    promise.then(function (value) {
+      //then后的括号里应该是参数param
-      console.log("===enter promise then_pass_" + value)
+      //https://www.cnblogs.com/qlongbg/p/11603328.html
-      wx.navigateTo({ url: './../activity-submit/activity-submit' })
+      promise.then(function (value) {
-    },
+        console.log("===enter promise then_pass_" + value)
-    function (value) {
+        wx.navigateTo({ url: './../activity-submit/activity-submit' })
-      console.log("===enter promise then_failed_" + value)
+      },
-    },);
+      function (value) {
+        console.log("===enter promise then_failed_" + value)
+      },);  
+    }
  },
@@ -212,3 +215,41 @@ Page({
 })
+function checkField(){
+  var info = ""
+  var products = app.globalData.postData.photoProduct
+  for(var i=0; i<products.length; i++)
+  {
+    if(products[i].productDesc==undefined || products[i].productDesc=="")
+    {
+      info = "请输入第"+ i +"项活动类别"
+    }
+  }
+  if(app.globalData.postData.photoTitle.length == 0)
+  {
+    info = "请输入活动标题"
+    wx.showModal({
+      content: info,
+      showCancel: false,
+      confirmText: '确认'
+    })
+    return false;
+  }
+  else if(info!="")
+  {
+    wx.showModal({
+      content: info,
+      showCancel: false,
+      confirmText: '确认'
+    })
+    return false;
+  }
+  console.log("字段校验成功")
+  return true;
+}
--- a/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
 // pages/member/activity-post/activity-submit/activity-submit.js
@@ -91,6 +91,7 @@ Page({
    _this.setData({ defaultCity })
    var memberInfo = app.globalData.memberInfo || {}
    memberInfo["member_city"] = defaultCity
+    memberInfo["member_slogan"] = "标语待完善"
    app.globalData.memberInfo = memberInfo
  },
@@ -107,7 +108,17 @@ Page({
  // Date Flow
  // 提交 tbl_member, oss 和数据库
-  onSubmitPost: function () {
+  // 活动提交入口
+  onSubmit: function(e) {
+    var _this = this;
+    if(_this.checkField())
+    {
+      _this.submitPost()
+    }
+  },
+  submitPost: function () {
    var _this = this;
    var title = app.globalData.postData.photoTitle
    var content = app.globalData.postData.photoContent; //获取content
@@ -434,13 +445,6 @@ Page({
  },
-  // 活动提交入口
-  onSubmit: function(e) {
-    var _this = this;
-    _this.onSubmitPost()
-  },
  // 授权入口: 获取用户授权信息
  // authStatus=='00' && members.length == 0
  getUserInfo: function (e) {
@@ -461,7 +465,7 @@ Page({
          promise_login.then(
            function (value) {
              console.log("===enter promise_login then_pass_" + value)          
-              _this.onSubmitPost()
+              _this.onSubmit()
            },
            function (value) {
              console.log("===enter promise_login then_failed_" + value)
@@ -493,7 +497,7 @@ Page({
  // 添加口号
  bindSlogan(e) {
    var _this = this;
-    var memberInfo = _this.data.memberInfo || {}
+    var memberInfo = app.globalData.memberInfo || {}
    memberInfo["member_slogan"] = e.detail.value
    app.globalData.memberInfo = memberInfo
    _this.setData({ memberInfo })
@@ -501,7 +505,7 @@ Page({
  // 添加名称
  bindName(e) {
    var _this = this;
-    var memberInfo = _this.data.memberInfo || {}
+    var memberInfo = app.globalData.memberInfo || {}
    memberInfo["member_name"] = e.detail.value
    app.globalData.memberInfo = memberInfo
    _this.setData({ memberInfo })    
@@ -510,7 +514,7 @@ Page({
  // jscat 20200915, 
  bindCity(e) {
    var _this = this;
-    var memberInfo = _this.data.memberInfo || {}
+    var memberInfo = app.globalData.memberInfo || {}
    memberInfo["member_city"] = e.detail.value
    app.globalData.memberInfo = memberInfo
    _this.setData({ memberInfo })
@@ -518,7 +522,7 @@ Page({
  //添加地址
  bindAddress(e) {
    var _this = this;
-    var memberInfo = _this.data.memberInfo || {}
+    var memberInfo = app.globalData.memberInfo || {}
    memberInfo["member_address"] = e.detail.value
    app.globalData.memberInfo = memberInfo
    _this.setData({ memberInfo })    
@@ -734,5 +738,58 @@ Page({
    })
  },  
+  checkField(){
+    var _this = this;
+    var info = ""
+    if(app.globalData.postData.photoContent.length == 0)
+    {
+      info = "请输入活动内容"
+      wx.showModal({
+        content: info,
+        showCancel: false,
+        confirmText: '确认'
+      })
+      return false;
+    }
+    else if(_this.data.logoArray.length == 0)
+    {
+      info = "请上传店铺logo"
+      wx.showModal({
+        content: info,
+        showCancel: false,
+        confirmText: '确认'
+      })
+      return false;
+    }  
+    else if(app.globalData.memberInfo.member_name == undefined || app.globalData.memberInfo.member_name.length == 0)
+    {
+      info = "请输入店铺名称"
+      wx.showModal({
+        content: info,
+        showCancel: false,
+        confirmText: '确认'
+      })
+      return false;
+    }
+    else if(app.globalData.memberInfo.member_address == undefined || app.globalData.memberInfo.member_address.length == 0)
+    {
+      info = "请输入店铺地址"
+      wx.showModal({
+        content: info,
+        showCancel: false,
+        confirmText: '确认'
+      })
+      return false;
+    }
+    console.log("字段校验成功")
+    return true;
+  },
 })