产品化更新

js_sdk/http.js

@@ -604,6 +604,12 @@ export function listHomeCommunityActivity(data) {
         data, {}
     )
 }
+export function insertHomeCommunityActivity(data) {
+    return $http.post(
+        '/wx/homeActivity/insertHomeCommunityActivity',
+        data, {}
+    )
+}
 export function activityList(data) {
     return $http.post(
         '/wx/homeActivity/list',

pages/subPackages/activityPromulgate/add.vue

@@ -37,6 +37,7 @@
                 :file-list="fileList"
                 @after-read="uploadRYXXZP"
                 :show-upload="true"
+                accept="media"
             />
           </div>
         </li>
@@ -83,9 +84,9 @@
           <div class="detailLi2Box">
             <van-uploader
                 :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
+                @delete="deleteRYXXZP2"
+                :file-list="fileList2"
+                @after-read="uploadRYXXZP2"
                 :show-upload="true"
             />
           </div>
@@ -105,11 +106,11 @@
              <span style="color: red">*</span>&nbsp; 活动地址
           </span>
           <div class="placeBox">
-            <input placeholder="使用地图拾取" class="timeIpt" v-model="form.activityAddress" disabled>
+            <input placeholder="使用地图拾取" class="locationIpt" v-model="form.activityAddress" disabled>
             <van-icon name="location" style="color: rgba(51, 51, 51, 0.90);font-size: 30rpx" @tap="toMap"/>
           </div>
           <div class="placeBox">
-            <input placeholder="请补充详细地址，如楼栋-门牌号" class="timeIpt" v-model="form.activityAddressDetail">
+            <input placeholder="请补充详细地址，如楼栋-门牌号" class="locationIpt" v-model="form.activityAddressDetail">
           </div>
         </li>
       </ul>
@@ -134,7 +135,7 @@
              <span style="color: red">*</span>&nbsp; 报名时间
           </span>
           <div class="choosTimeBox">
-            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="regTime1" @click="showTime('regStartTime')">
+            <input placeholder="请选择年月日时分" class="timeIpt" disabled v-model="form.registrationStartTime" @click="showTime('regStartTime')">
             <span class="midZ">至</span>
             <input placeholder="自动带出" class="timeIpt" disabled v-model="form.activityStartTime" style="background: white">
 <!--            <span>活动开始时间</span>-->
@@ -156,8 +157,8 @@
       </ul>
     </div>
        <div class="buttonBox">
-         <button class="btn zcBtn">暂存</button>
-         <button class="btn fbBtn" @tap="submit('发布')">发布</button>
+         <button class="btn zcBtn" @tap="submit('0')">暂存</button>
+         <button class="btn fbBtn" @tap="submit('1')">发布</button>
        </div>
     <van-popup
         :show="timeShow"
@@ -175,7 +176,7 @@
   </div>
 </template>
 <script>
-import {getByCodes} from "@/js_sdk/http";
+import { getByCodes,insertHomeCommunityActivity, getUserLocalStorageInfo} from "@/js_sdk/http";
 export default {
   data(){
     return {
@@ -185,11 +186,11 @@ export default {
       isCheck2:false,
       time1Str:'',
       time2Str:'',
-      regTime1:'',
       regTime1Str:'',
       place:'',
       currentDate: new Date().getTime(),
       form:{
+        createdBy:getUserLocalStorageInfo().userId,
         activityName:'',
         activityType:'3',
         activityPhone: '',
@@ -203,16 +204,38 @@ export default {
         activityQuota:'',
         longitude:'',
         latitude:'',
+        registrationStartTime:'',
+        registrationEndTime:'',
+        annex:'',
+        releaseUserName:'',
       },
       phone:'',
       tabList:[],
       fileList:[],
+      fileList2:[],
       optionsType:'',
       timePickerType:'',
     }
   },
   onLoad(options) {
-    console.log('options',options);
+    if (options.item){
+      const form = JSON.parse(options.item)
+      this.form = form
+      this.fileList = JSON.parse(form.annex)
+      const fileId = form.activityContentPicture.split(',')
+      fileId.forEach(item=>{
+        this.fileList2.push({
+          imgUrl: "/FileController/download/" + item,
+          id: item,
+          url:
+              this.$constant.BASE_URI +
+              "/FileController/download/" +
+              item,
+          type:'image',
+          isImage:true,
+        });
+      })
+    }
   },
   onShow(){
     this.getByCodes()
@@ -293,10 +316,10 @@ export default {
             this.$showToast("请选择合理时间");
             return
           }else{
-            this.regTime1 = dateString
+            this.form.registrationStartTime = dateString
           }
         }else{
-          this.regTime1 = dateString
+          this.form.registrationStartTime = dateString
         }
       }
       this.timeShow = false
@@ -316,7 +339,7 @@ export default {
       }
     },
 
-    submit(e){
+    submit(ele){
       const _this = this;
       if (_this.form.activityName === "") {
         this.$showToast("请填写活动主题");
@@ -330,10 +353,6 @@ export default {
         this.$showToast("请选择报名开始时间");
         return;
       }
-      if (_this.form.registrationEndTime === "") {
-        this.$showToast("请选择报名结束时间");
-        return;
-      }
       if (_this.form.activityStartTime === "") {
         this.$showToast("请选择活动开始时间");
         return;
@@ -346,6 +365,10 @@ export default {
         this.$showToast("请上传主题图");
         return;
       }
+      if (!_this.fileList2.length) {
+        this.$showToast("请上传活动内容图片");
+        return;
+      }
       if (_this.form.activityPhone === "") {
         this.$showToast("请输入联系电话");
         return;
@@ -354,14 +377,50 @@ export default {
         this.$showToast("请输入活动地址");
         return;
       }
+      if (!_this.form.registrationConditions) {
+        this.$showToast("请输入报名条件");
+        return;
+      }
+      if (!_this.form.activityAddressDetail) {
+        this.$showToast("请补充详细地址");
+        return;
+      }
+      if (!_this.form.registrationStartTime) {
+        this.$showToast("请选择报名开始时间");
+        return;
+      }
       // 差报名条件等必填
-      console.log(_this.form)
+      // console.log(_this.form)
+      _this.form.registrationEndTime = this.form.activityStartTime
+      _this.form.annex = JSON.stringify(_this.fileList);
+      _this.form.releaseStatus = ele;
+      if (ele==='1'){
+        _this.form.releaseUserName = getUserLocalStorageInfo().username
+      }
+      const arr = []
+      _this.fileList2.forEach(e=>{
+        arr.push(e.id)
+      })
+      _this.form.activityContentPicture = arr.toString()
+      console.log('_this.form',_this.form)
+      insertHomeCommunityActivity(_this.form).then(res=>{
+        if (res.errno == 0){
+          this.$showToast("提交成功");
+          uni.navigateBack()
+        }else{
+          this.$showToast(res.errMsg);
+        }
+      })
     },
 
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
       this.$forceUpdate();
     },
+    deleteRYXXZP2(event) {
+      this.fileList2.splice(event.detail.index, 1);
+      this.$forceUpdate();
+    },
     uploadRYXXZP(event) {
       // console.log(event)
       let that = this;
@@ -402,6 +461,46 @@ export default {
         fail(res) {},
       });
     },
+    uploadRYXXZP2(event) {
+      // console.log(event)
+      let that = this;
+      const { file } = event.detail;
+      console.log(event.detail)
+      uni.uploadFile({
+        url: that.$constant.BASE_URI + "/wx/fileController/upload",
+        filePath: file.url,
+        name: "file",
+        formData: { user: "test" },
+        success(res) {
+          // 上传完成需要更新 fileList
+          let data = JSON.parse(res.data);
+          if (event.detail.file.type==='image'){
+            that.fileList2.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isImage:true,
+            });
+          }else{
+            that.fileList2.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isVideo:true
+            });
+          }
+        },
+        fail(res) {},
+      });
+    },
     // 时间选择单位
     formatter(type, val) {
       if (type === 'year') {
@@ -537,6 +636,14 @@ export default {
           align-items: center;
           font-size: 32rpx;
           margin: 12rpx 0;
+          .locationIpt{
+            width: 600rpx;
+            height: 96rpx;
+            font-size: 32rpx;
+            border-radius: 8rpx;
+            padding: 0 20rpx;
+            box-sizing: border-box;
+          }
         }
       }
     }

pages/subPackages/activityPromulgate/list.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="activityPromulgate">
         <div class="activityTop">
-          <div class="addRepair" @tap="newRelease">新增活动 <van-icon name="add" style="margin-left: 8rpx"/></div>
+          <div class="addRepair" @tap="newRelease(null)">新增活动 <van-icon name="add" style="margin-left: 8rpx"/></div>
           <div class="parkDynamicTab2">
             <div
                 v-for="(item, index) in tabList"
@@ -43,7 +43,7 @@
               <span>活动签到码</span>
             </div>
             <div class="listBtnBox">
-              <button class="rBtn editBtn" v-if="item.releaseStatus !== '1'">编辑</button>
+              <button class="rBtn editBtn" v-if="item.releaseStatus !== '1'" @tap="newRelease(item)">编辑</button>
               <button class="rBtn" :class="item.releaseStatus==='1'?'downBtn':'upBtn'" @tap="clickType(item)">{{item.releaseStatus==='1'?'下架':'上架'}}</button>
             </div>
           </div>
@@ -140,10 +140,17 @@ export default {
           }
         })
       },
-      newRelease(){
-        uni.navigateTo({
-          url:'/pages/subPackages/activityPromulgate/add'
-        })
+      newRelease(e){
+        // console.log(e)
+        if (e){
+          uni.navigateTo({
+            url:'/pages/subPackages/activityPromulgate/add?item=' + JSON.stringify(e)
+          })
+        }else{
+          uni.navigateTo({
+            url:'/pages/subPackages/activityPromulgate/add'
+          })
+        }
       },
       onChange(){
 
@@ -174,7 +181,7 @@ export default {
 
       toQrCode(item) {
         uni.navigateTo({
-          url:'/pages/subPackages/activityPromulgate/qrCode'
+          url:'/pages/subPackages/activityPromulgate/qrCode?item=' + JSON.stringify(item)
         })
       }
     }

pages/subPackages/activityPromulgate/qrCode.vue

@@ -2,14 +2,18 @@
     <div class="qrCodeBody">
       <div class="whiteBoard">
          <div class="qrCodeTitle">互联网私募如何入门？</div>
-         <div class="qrCodeMsg">活动时间：活动开始时间 — 结束时间</div>
-         <div class="qrCodeMsg">活动地址：XXXXXXXXXXXXXXXXXXXX</div>
+         <div class="qrCodeMsg">活动时间：<br/>
+           {{form.activityStartTime}} — {{form.activityEndTime}}
+         </div>
+         <div class="qrCodeMsg">活动地址：<br/>
+           {{form.activityAddress}} — {{form.activityAddressDetail}}
+         </div>
          <div class="qrCodeBox">
-             <img src="https://www.idea-co-sf.com/gardenProduct/image/erweima.png" class="qrCode">
+             <img :src="qrCode" class="qrCode">
              <span class="qrCodeInfo">扫一扫上面的二维码，完成签到</span>
          </div>
          <div class="bottomBtnBox">
-           <button class="btn qdBtn">协助签到</button>
+           <button class="btn qdBtn" @tap="helpQd">协助签到</button>
            <button class="btn commitBtn" @tap="commitImg">保存图片</button>
          </div>
       </div>
@@ -21,13 +25,27 @@ export default {
   name: "qrCode",
   data(){
     return{
-
+      form:{},
+      qrCode:''
+    }
+  },
+  onLoad(options) {
+    if (options.item){
+      this.form = JSON.parse(options.item)
+      this.qrCode = this.$constant.BASE_URI +
+          "/FileController/download/" +
+          this.form.qrCode
     }
   },
   methods:{
+    helpQd(){
+      uni.navigateTo({
+        url:'/pages/subPackages/parkActivity/activityCheckIn?item=' + JSON.stringify(this.form)
+      })
+    },
     commitImg(){
         // 假设你已经有一个图片链接或者图片路径
-        const imageSrc = 'https://www.idea-co-sf.com/gardenProduct/image/erweima.png';
+        const imageSrc = this.qrCode
 
         // 下载图片
         uni.downloadFile({

pages/utils/constant.js

@@ -4,7 +4,7 @@ export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.111:9015"; // 许峰本地
+// export const BASE_URI = "http://192.168.2.103:9015"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {

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

@@ -3972,7 +3972,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -11015,7 +11015,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","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 + ']');
@@ -11036,14 +11036,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","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({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -11139,7 +11139,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -26393,7 +26393,7 @@ var BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi';
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.111:9015"; // 许峰本地
+// export const BASE_URI = "http://192.168.2.103:9015"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 exports.BASE_URI = BASE_URI;
 var _default = {
@@ -27411,6 +27411,7 @@ exports.getUserPower = getUserPower;
 exports.getWxCompanyTags = getWxCompanyTags;
 exports.handleList = handleList;
 exports.homeActivityClickCollect = homeActivityClickCollect;
+exports.insertHomeCommunityActivity = insertHomeCommunityActivity;
 exports.insertRegisSignInfo = insertRegisSignInfo;
 exports.interviewEscalationListAll = interviewEscalationListAll;
 exports.isFinishComInfo = isFinishComInfo;
@@ -27847,6 +27848,9 @@ function editHomeCommunityActivity(data) {
 function listHomeCommunityActivity(data) {
   return _requestConfig.default.post('/wx/homeActivity/listHomeCommunityActivity', data, {});
 }
+function insertHomeCommunityActivity(data) {
+  return _requestConfig.default.post('/wx/homeActivity/insertHomeCommunityActivity', data, {});
+}
 function activityList(data) {
   return _requestConfig.default.post('/wx/homeActivity/list', data, {});
 }

unpackage/dist/dev/mp-weixin/pages/subPackages/activityPromulgate/list.js

@@ -312,10 +312,17 @@ var _default = {
         }
       });
     },
-    newRelease: function newRelease() {
-      uni.navigateTo({
-        url: '/pages/subPackages/activityPromulgate/add'
-      });
+    newRelease: function newRelease(e) {
+      // console.log(e)
+      if (e) {
+        uni.navigateTo({
+          url: '/pages/subPackages/activityPromulgate/add?item=' + JSON.stringify(e)
+        });
+      } else {
+        uni.navigateTo({
+          url: '/pages/subPackages/activityPromulgate/add'
+        });
+      }
     },
     onChange: function onChange() {},
     clickType: function clickType(item) {
@@ -343,7 +350,7 @@ var _default = {
     },
     toQrCode: function toQrCode(item) {
       uni.navigateTo({
-        url: '/pages/subPackages/activityPromulgate/qrCode'
+        url: '/pages/subPackages/activityPromulgate/qrCode?item=' + JSON.stringify(item)
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/subPackages/components/tel-number/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

@@ -674,6 +674,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/subPackages/activityPromulgate/list",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }