jufubao-base 1.0.320-beta4 → 1.0.321-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.320-beta4",
+  "version": "1.0.321-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseAfterSales/JfbBaseAfterSales.vue

@@ -222,11 +222,16 @@
       doAddImage(){
         uni.chooseImage({
           count: 1,
-          sourceType: ['camera'],
+          sourceType: ['camera','album'],
           success: async (res) => {
             console.log('chooseImage',res);
-            // let filePath = res.tempFilePaths[0];
-            let file = res.tempFiles[0];
+            let file
+            // #ifdef MP-WEIXIN
+            file = res.tempFilePaths[0];
+            // #endif
+            // #ifdef H5
+            file = res.tempFiles[0];
+            // #endif
             this.$xdShowLoading({});
             try{
               let image = await this.uploadImage(file);
@@ -239,7 +244,7 @@
         })
       },
       uploadImage(file){
-        let fileName = file.name;
+        let fileName = file.name||'image.png';
         return new Promise((resolve, reject) => {
           jfbRootExec("getConOssSign", {
             vm: this,
@@ -251,7 +256,12 @@
             delete res['cdn_url']
             uni.uploadFile({
               url: res.action,
+              // #ifdef H5
               file: file,
+              // #endif
+              // #ifdef MP-WEIXIN
+              filePath: file, // 小程序图片临时路径
+              // #endif
               name: 'file',
               formData: {
                 ...res,

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -25,6 +25,22 @@
           }"
         >
           <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
+            <view v-if="showID">
+              <input
+                @input="filterSpaces"
+                v-model="staff_id_name"
+                :placeholder="holdID"
+                type="text"
+              />
+            </view>
+            <view v-if="showName">
+              <input
+                @input="filterSpaces"
+                v-model="staff_name_name"
+                :placeholder="holdName"
+                type="text"
+              />
+            </view>
             <view>
               <input
                 @input="filterSpaces"
@@ -62,6 +78,22 @@
             >确认领取</xd-button>
           </view>
           <view v-else class="jfb-base-con-phone__body-wrap-input">
+            <view v-if="showID">
+              <input
+                @input="filterSpaces"
+                v-model="staff_id_name"
+                :placeholder="holdID"
+                type="text"
+              />
+            </view>
+            <view v-if="showName">
+              <input
+                @input="filterSpaces"
+                v-model="staff_name_name"
+                :placeholder="holdName"
+                type="text"
+              />
+            </view>
             <view class="jfb-base-con-phone__body-wrap-input-phone">
               <view class="jfb-base-con-phone__body-wrap-input-phone-change">
                 <view>当前登录手机号</view>
@@ -211,6 +243,13 @@ export default {
       dialogShow: false,
       showSignatureRef: false,
 
+      //员工信息
+      showID: false,
+      showName: false,
+      staff_id_name:'',
+      staff_name_name:'',
+      holdID:'请输入员工工号',
+      holdName: '请输入员工姓名',
     };
   },
   watch: {
@@ -394,7 +433,18 @@ export default {
           this.background = getServiceUrl(res.background);
           this.used_background = getServiceUrl(res.used_background);
           this.errmessage = res.message;
+
+          //员工信息
+          this.showID = res['show_staff_id'] === 'Y';
+          this.showName = res['show_staff_name'] === 'Y';
+          this.holdID = res['staff_id_name'] || '请输入员工工号';
+          this.holdName = res['staff_name_name'] || '请输入员工姓名';
+          if(this.$configProject['isPreview']) {
+            this.showID =  this.showName = false
+          }
+
           this.done = true;
+
         })
         .catch((err) => {
           console.log(err, "err");
@@ -440,6 +490,7 @@ export default {
           phone_number: this.phoneNumber,
           biz_name: "login",
           is_expire_time: 'Y',
+
         },
       }).then((res) => {
         this.startCountdown(res);
@@ -487,7 +538,12 @@ export default {
         phone: this.showCode ? this.phoneNumber : null,
         valid_code: this.showCode ? this.valid_code : null,
         biz_name: "login",
+        staff_id_name:this.staff_id_name,
+        staff_name_name:this.staff_name_name,
       }
+      if(this.showID) data['staff_id_name'] = this.staff_id_name;
+      if(this.showName) data['staff_name_name'] = this.staff_name_name;
+
       if(this.phone_signature === 'Y') data['phone_signature'] = this.phone_signature_url;
       this.$xdShowLoading({});
       jfbRootExec("getAllCouponPhone", {vm: this, data: data})