From 3fc241d02fb8b671289de3d9d80bf848349c04d4 Mon Sep 17 00:00:00 2001
From: Sanakey <714737083@qq.com>
Date: 星期五, 09 七月 2021 18:04:12 +0800
Subject: [PATCH] 海报、新建活动等新版完善

---
 pages/signUpCreate/signUpCreate.ts |  409 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 207 insertions(+), 202 deletions(-)

diff --git a/pages/signUpCreate/signUpCreate.ts b/pages/signUpCreate/signUpCreate.ts
index 80e1688..bc56904 100644
--- a/pages/signUpCreate/signUpCreate.ts
+++ b/pages/signUpCreate/signUpCreate.ts
@@ -1,6 +1,6 @@
 // import * as dayjs from "dayjs";
 import MyValidator from "../../utils/myValidator";
-
+import {getSaveData, promotionsSaveHandler, promotionsSubmitHandler} from "../../modules/promotionsCreate";
 let validatorInstance:MyValidator;
 // const app = getApp<IAppOption>();
 Page({
@@ -38,53 +38,54 @@
     }
   },
   async getSaveData() {
-    let doccode = this.data.doccode;
-    let [error, result] = await wx.$utils.to(
-      wx.$http.request({
-        url:`/shopping/panicBuying.do?m=getPanicBuyingDetail`,
-        data:{
-          doccode,
-          isEdit:true,
-          SellerOpenId:wx.globalData.OpenId
-        }
-      })
-    )
-    if (error){
-      console.log(error);
-      return;
-    }
-    console.log(result);
-    let data = result.list[0];
-    let formData = {
-      promotionsTitle: data.title,
-      originalPrice: data.salesPrice,
-      promotionDescription: data.description,
-      startTime: data.effectiveStartDate,
-      endTime: data.effectiveEndDate,
-      coverImageList: (data.coverImageUrl&&this.getCoverImageList(data))||[],
-      // imagesList: (data.imagesUrl.length>0&&this.getImagesList(data))||[],
-      imagesList: data.imagesUrl,
-      coverImage: data.coverImage,
-      images: data.images,
-      freeId:data.freeId,
-    };
-    this.setData({
-      ...formData,
-      coverImageUrl:data.coverImageUrl,
-      sellerList:result.sellerList,
-      storeList:result.storeList,
-      status:data.panicBuyingStatus,
-      delivery:{
-        freeId:data.freeId,
-        freeName:data.freeName,
-        isRequiredAddress:data.isRequiredAddress,
-        transCosts:data.transCosts,
-      }
-    });
-    console.log('閰嶉�佹暟鎹�傘�傘��',this.data.delivery);
-    wx.setNavigationBarTitle({
-      title: data.title
-    })
+    await getSaveData(this)
+    // let doccode = this.data.doccode;
+    // let [error, result] = await wx.$utils.to(
+    //   wx.$http.request({
+    //     url:`/shopping/panicBuying.do?m=getPanicBuyingDetail`,
+    //     data:{
+    //       doccode,
+    //       isEdit:true,
+    //       SellerOpenId:wx.globalData.OpenId
+    //     }
+    //   })
+    // )
+    // if (error){
+    //   console.log(error);
+    //   return;
+    // }
+    // console.log(result);
+    // let data = result.list[0];
+    // let formData = {
+    //   promotionsTitle: data.title,
+    //   originalPrice: data.salesPrice,
+    //   promotionDescription: data.description,
+    //   startTime: data.effectiveStartDate,
+    //   endTime: data.effectiveEndDate,
+    //   coverImageList: (data.coverImageUrl&&this.getCoverImageList(data))||[],
+    //   // imagesList: (data.imagesUrl.length>0&&this.getImagesList(data))||[],
+    //   imagesList: data.imagesUrl,
+    //   coverImage: data.coverImage,
+    //   images: data.images,
+    //   freeId:data.freeId,
+    // };
+    // this.setData({
+    //   ...formData,
+    //   coverImageUrl:data.coverImageUrl,
+    //   sellerList:result.sellerList,
+    //   storeList:result.storeList,
+    //   status:data.panicBuyingStatus,
+    //   delivery:{
+    //     freeId:data.freeId,
+    //     freeName:data.freeName,
+    //     isRequiredAddress:data.isRequiredAddress,
+    //     transCosts:data.transCosts,
+    //   }
+    // });
+    // console.log('閰嶉�佹暟鎹�傘�傘��',this.data.delivery);
+    // wx.setNavigationBarTitle({
+    //   title: data.title
+    // })
   },
 
   getCoverImageList(data:any){
@@ -137,173 +138,177 @@
     })
   },
 
-  async postFormData(data:object){
-    let [error, res] = await wx.$utils.to(
-      wx.$http.request({
-        url:'/shopping/panicBuying.do?m=saveDocCode',
-        data,
-        method:'POST'
-      })
-    )
-    if (error) {
-      console.log(error);
-      return false;
-    }
-    console.log(res);
-    if (res.state === 'success') {
-      wx.showToast({
-        title: '鎴愬姛',
-        duration: 2000
-      })
-      this.setData({
-        doccode:res.DocCode
-      })
-      // console.log('娲诲姩鍗曞彿',this.data.formData);
-    }
-    if (res.state === 'failed'&&res.sellerCheckedBalance>0) {
-      this.setData({
-        sellerUnCheckedNames: res.sellerUnCheckedNames,
-        isShowDialog: true
-      })
-    }
-    return res.state === 'success';
-  },
+  // async postFormData(data:object){
+  //   let [error, res] = await wx.$utils.to(
+  //     wx.$http.request({
+  //       url:'/shopping/panicBuying.do?m=saveDocCode',
+  //       data,
+  //       method:'POST'
+  //     })
+  //   )
+  //   if (error) {
+  //     console.log(error);
+  //     return false;
+  //   }
+  //   console.log(res);
+  //   if (res.state === 'success') {
+  //     wx.showToast({
+  //       title: '鎴愬姛',
+  //       duration: 2000
+  //     })
+  //     this.setData({
+  //       doccode:res.DocCode
+  //     })
+  //     // console.log('娲诲姩鍗曞彿',this.data.formData);
+  //   }
+  //   if (res.state === 'failed'&&res.sellerCheckedBalance>0) {
+  //     this.setData({
+  //       sellerUnCheckedNames: res.sellerUnCheckedNames,
+  //       isShowDialog: true
+  //     })
+  //   }
+  //   return res.state === 'success';
+  // },
   onSubmit:wx.$utils.debounce(function(this:any){
     this.submitHandler();
     return;
   }),
 
   async submitHandler() {
-    let timeQuantum = this.selectComponent('#time-quantum');
-    let sellerEdit = this.selectComponent('#seller-edit');
-    let storeEdit = this.selectComponent('#store-edit');
-    let fileUploader = this.selectComponent('#file-uploader');
-    let fileUploaderMultiple = this.selectComponent('#file-uploader-multiple');
-
-
-    console.log('sellerEdit',);
-    console.log(timeQuantum);
-
-    let checkStartTime = timeQuantum.checkTime("startTime", "璇烽�夋嫨璁″垝寮�濮嬫椂闂�");
-    let checkEndTime = timeQuantum.checkTime("endTime", "璇烽�夋嫨璁″垝缁撴潫鏃堕棿");
-    let checkCoverImage = fileUploader.checkImages("coverImage", "璇蜂笂浼犱竴寮犲皝闈㈠浘");
-    // let checkImages = fileUploaderMultiple.checkImages("images", "璇疯嚦灏戜笂浼犱竴寮犲浘鐗�");
-    let checkAllData = validatorInstance.checkAllData();
-    // if (this.data.goodsImgList.length < 1) {
-    //   console.log('璇蜂笂浼犱骇鍝佸浘鐗�');
+    await promotionsSubmitHandler(this,validatorInstance);
+    return;
+    // let timeQuantum = this.selectComponent('#time-quantum');
+    // let sellerEdit = this.selectComponent('#seller-edit');
+    // let storeEdit = this.selectComponent('#store-edit');
+    // let fileUploader = this.selectComponent('#file-uploader');
+    // let fileUploaderMultiple = this.selectComponent('#file-uploader-multiple');
+    //
+    //
+    // console.log('sellerEdit',);
+    // console.log(timeQuantum);
+    //
+    // let checkStartTime = timeQuantum.checkTime("startTime", "璇烽�夋嫨璁″垝寮�濮嬫椂闂�");
+    // let checkEndTime = timeQuantum.checkTime("endTime", "璇烽�夋嫨璁″垝缁撴潫鏃堕棿");
+    // let checkCoverImage = fileUploader.checkImages("coverImage", "璇蜂笂浼犱竴寮犲皝闈㈠浘");
+    // // let checkImages = fileUploaderMultiple.checkImages("images", "璇疯嚦灏戜笂浼犱竴寮犲浘鐗�");
+    // let checkAllData = validatorInstance.checkAllData();
+    // // if (this.data.goodsImgList.length < 1) {
+    // //   console.log('璇蜂笂浼犱骇鍝佸浘鐗�');
+    // // }
+    // let sellerList = sellerEdit.getSellerList();
+    // if (sellerList.length<1) {
+    //   wx.showToast({
+    //     title: '璇烽�夋嫨钀ラ攢浜哄憳',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   return
     // }
-    let sellerList = sellerEdit.getSellerList();
-    if (sellerList.length<1) {
-      wx.showToast({
-        title: '璇烽�夋嫨钀ラ攢浜哄憳',
-        icon: 'none',
-        duration: 2000
-      })
-      return
-    }
-    let checkDefaultSeller = sellerEdit.checkDefaultSeller();
-    if (!checkDefaultSeller) {
-      wx.showToast({
-        title: '璇烽�夋嫨榛樿钀ラ攢浜哄憳',
-        icon: 'none',
-        duration: 2000
-      })
-      return
-    }
-    console.log('checkDefaultSeller',checkDefaultSeller);
-
-    let storeList = storeEdit.getSelectedStoreIdList();
-    console.log('寰呮彁浜ょ殑闂ㄥ簵id',storeList);
-
-    let checkArr = [checkStartTime,checkEndTime,checkCoverImage,checkAllData];
-    let data = {};
-    if (checkArr.every((item)=>{
-      return item
-    })){
-      console.log('....鎻愪氦鎴愬姛');
-      let coverImage = fileUploader.getCoverImageUnid();
-      let coverImageUrl = fileUploader.getImgList()[0].url||'';
-      this.setData({
-        coverImageUrl
-      })
-      let images = fileUploaderMultiple.getImagesUnid();
-      console.log(coverImage,images);
-      let formData: any = this.data;
-      data = {
-        docCode: formData.doccode, //娲诲姩鍗曞彿锛屾柊寤烘椿鍔ㄦ椂涓虹┖鍊硷紝缂栬緫鏃堕渶瑕乨occode鍊�
-        formId: formData.formId, //鍔熻兘鍙凤細绉掓潃 710802 锛� 鎶ュ悕閭�绾� 710803 锛屽洟璐� 710804
-        docStatus:100, //鍗曟嵁鐘舵��: 0 淇濆瓨锛堣捣鑽夛級 锛�100 鍙戝竷
-        coverImage,
-        images,
-        // ...this.data.formData,
-
-        effectiveStartDate: formData.startTime,
-        effectiveEndDate: formData.endTime,
-        freeId: formData.freeId,
-        title: formData.promotionsTitle,
-        // originalPrice: Number(formData.originalPrice),
-        salesPrice: Number(formData.originalPrice),
-        description: formData.promotionDescription,
-        storeList,
-        sellerList,
-      }
-      console.log('寰呭彂甯冩暟鎹�',data);
-      if (!await this.postFormData(data)) return;
-      if (this.data.fromPage=='edit'){
-        wx.navigateBack();
-      } else{
-        wx.redirectTo({
-          url:'../promotionsManageList/promotionsManageList?tab=2'
-        })
-      }
-
-    } else {
-      wx.showToast({
-        title: '椤甸潰杩樻湁閿欒鏈鐞�',
-        icon: 'none',
-        duration: 2000
-      })
-      console.log('杩樻湁閿欒鏈鐞�');
-    }
+    // let checkDefaultSeller = sellerEdit.checkDefaultSeller();
+    // if (!checkDefaultSeller) {
+    //   wx.showToast({
+    //     title: '璇烽�夋嫨榛樿钀ラ攢浜哄憳',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   return
+    // }
+    // console.log('checkDefaultSeller',checkDefaultSeller);
+    //
+    // let storeList = storeEdit.getSelectedStoreIdList();
+    // console.log('寰呮彁浜ょ殑闂ㄥ簵id',storeList);
+    //
+    // let checkArr = [checkStartTime,checkEndTime,checkCoverImage,checkAllData];
+    // let data = {};
+    // if (checkArr.every((item)=>{
+    //   return item
+    // })){
+    //   console.log('....鎻愪氦鎴愬姛');
+    //   let coverImage = fileUploader.getCoverImageUnid();
+    //   let coverImageUrl = fileUploader.getImgList()[0].url||'';
+    //   this.setData({
+    //     coverImageUrl
+    //   })
+    //   let images = fileUploaderMultiple.getImagesUnid();
+    //   console.log(coverImage,images);
+    //   let formData: any = this.data;
+    //   data = {
+    //     docCode: formData.doccode, //娲诲姩鍗曞彿锛屾柊寤烘椿鍔ㄦ椂涓虹┖鍊硷紝缂栬緫鏃堕渶瑕乨occode鍊�
+    //     formId: formData.formId, //鍔熻兘鍙凤細绉掓潃 710802 锛� 鎶ュ悕閭�绾� 710803 锛屽洟璐� 710804
+    //     docStatus:100, //鍗曟嵁鐘舵��: 0 淇濆瓨锛堣捣鑽夛級 锛�100 鍙戝竷
+    //     coverImage,
+    //     images,
+    //     // ...this.data.formData,
+    //
+    //     effectiveStartDate: formData.startTime,
+    //     effectiveEndDate: formData.endTime,
+    //     freeId: formData.freeId,
+    //     title: formData.promotionsTitle,
+    //     // originalPrice: Number(formData.originalPrice),
+    //     salesPrice: Number(formData.originalPrice),
+    //     description: formData.promotionDescription,
+    //     storeList,
+    //     sellerList,
+    //   }
+    //   console.log('寰呭彂甯冩暟鎹�',data);
+    //   if (!await this.postFormData(data)) return;
+    //   if (this.data.fromPage=='edit'){
+    //     wx.navigateBack();
+    //   } else{
+    //     wx.redirectTo({
+    //       url:'../promotionsManageList/promotionsManageList?tab=2'
+    //     })
+    //   }
+    //
+    // } else {
+    //   wx.showToast({
+    //     title: '椤甸潰杩樻湁閿欒鏈鐞�',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   console.log('杩樻湁閿欒鏈鐞�');
+    // }
 
 
   },
 
   onSave:wx.$utils.debounce(function(this:any){
-    let sellerEdit = this.selectComponent('#seller-edit');
-    let sellerList = sellerEdit.getSellerList();
-    let storeEdit = this.selectComponent('#store-edit');
-    let storeList = storeEdit.getSelectedStoreIdList();
-    console.log('寰呮彁浜ょ殑闂ㄥ簵id',storeList);
-    let fileUploader = this.selectComponent('#file-uploader');
-    let fileUploaderMultiple = this.selectComponent('#file-uploader-multiple');
-    console.log('....鎻愪氦鎴愬姛');
-    let coverImage = fileUploader.getCoverImageUnid();
-    let images = fileUploaderMultiple.getImagesUnid();
-
-    console.log(coverImage,images);
-    let formData: any = this.data;
-    let data = {
-      docCode: formData.doccode, //娲诲姩鍗曞彿锛屾柊寤烘椿鍔ㄦ椂涓虹┖鍊硷紝缂栬緫鏃堕渶瑕乨occode鍊�
-      formId: formData.formId, //鍔熻兘鍙凤細绉掓潃 710802 锛� 鎶ュ悕閭�绾� 710803 锛屽洟璐� 710804
-      docStatus: 0, //鍗曟嵁鐘舵��: 0 淇濆瓨锛堣捣鑽夛級 锛�100 鍙戝竷
-      coverImage,
-      images,
-      // ...this.data.formData,
-
-      effectiveStartDate: formData.startTime,
-      effectiveEndDate: formData.endTime,
-      freeId: formData.freeId,
-      title: formData.promotionsTitle,
-      // originalPrice: Number(formData.originalPrice)||0,
-      salesPrice: Number(formData.originalPrice),
-      description: formData.promotionDescription,
-      storeList,
-      sellerList,
-    }
-    console.log('寰呬繚瀛樻暟鎹�',data);
-    this.postFormData(data);
+    promotionsSaveHandler(this);
     return;
+    // let sellerEdit = this.selectComponent('#seller-edit');
+    // let sellerList = sellerEdit.getSellerList();
+    // let storeEdit = this.selectComponent('#store-edit');
+    // let storeList = storeEdit.getSelectedStoreIdList();
+    // console.log('寰呮彁浜ょ殑闂ㄥ簵id',storeList);
+    // let fileUploader = this.selectComponent('#file-uploader');
+    // let fileUploaderMultiple = this.selectComponent('#file-uploader-multiple');
+    // console.log('....鎻愪氦鎴愬姛');
+    // let coverImage = fileUploader.getCoverImageUnid();
+    // let images = fileUploaderMultiple.getImagesUnid();
+    //
+    // console.log(coverImage,images);
+    // let formData: any = this.data;
+    // let data = {
+    //   docCode: formData.doccode, //娲诲姩鍗曞彿锛屾柊寤烘椿鍔ㄦ椂涓虹┖鍊硷紝缂栬緫鏃堕渶瑕乨occode鍊�
+    //   formId: formData.formId, //鍔熻兘鍙凤細绉掓潃 710802 锛� 鎶ュ悕閭�绾� 710803 锛屽洟璐� 710804
+    //   docStatus: 0, //鍗曟嵁鐘舵��: 0 淇濆瓨锛堣捣鑽夛級 锛�100 鍙戝竷
+    //   coverImage,
+    //   images,
+    //   // ...this.data.formData,
+    //
+    //   effectiveStartDate: formData.startTime,
+    //   effectiveEndDate: formData.endTime,
+    //   freeId: formData.freeId,
+    //   title: formData.promotionsTitle,
+    //   // originalPrice: Number(formData.originalPrice)||0,
+    //   salesPrice: Number(formData.originalPrice),
+    //   description: formData.promotionDescription,
+    //   storeList,
+    //   sellerList,
+    // }
+    // console.log('寰呬繚瀛樻暟鎹�',data);
+    // this.postFormData(data);
+    // return;
   }),
   // onInputStartDate() {},
   // onInputEndDate() {},

--
Gitblit v1.8.0