Merge branch 'release/6.8.9' into 'master'

Release/6.8.9



See merge request !9

@@ -21,6 +21,11 @@ export default {
         this.$sdk.goLogin();
       });
     }
+
+    this.$yoho.setWebview({
+      bounces: false,
+      clearCacheWhenDestroy: false
+    });
   },
   watch: {
     'yoho.context.needLogin': function(newVal) {

@@ -574,6 +574,17 @@ const yoho = {
 
       // tip(tipInfo);
     }
+  },
+
+  setWebview(args, success, fail) {
+    if (this.isYohoBuy && window.yohoInterface) {
+      window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
+        method: 'set.webview',
+        arguments: args
+      });
+    } else {
+      // tip(tipInfo);
+    }
   }
 };
 

 <template>
   <div class="layout">
     <LayoutHeader class="layout-header"></LayoutHeader>
-    <div class="layout-context">
+    <div class="layout-context" :class="{fixscroll: this.fixscroll}">
       <slot></slot>
     </div>
   </div>
@@ -12,6 +12,7 @@ import LayoutHeader from './header-ufo';
 
 export default {
   name: 'LayoutApp',
+  props: ['fixscroll'],
   components: {
     LayoutHeader
   }
@@ -35,5 +36,9 @@ export default {
     overflow: hidden;
     position: relative;
   }
+
+  .fixscroll {
+    overflow: scroll;
+  }
 }
 </style>

 import Order from './order';
 import license from './license';
 import alipay from './alipay';
+import selfUfo from './selfUfo';
 
-export default [...Order, ...license, ...alipay];
+export default [...Order, ...license, ...alipay, ...selfUfo];

@@ -2,15 +2,19 @@
   <div class="input-class">
     <div class="wrapper-label" v-if="label">
       <label class="input-label"> {{label}} </label>
+      <span class="tip" v-if="showRequired">{{ required ? tip.required : tip.optional}}</span>
       <span class="error" v-if="showError">{{error}}</span>
     </div>
     <slot>
-      <input ref="input" class="wrapper-input" :placeholder="placeHolder" :value="inputValue" @input="onInputChange" @blur="validate"/>
+      <input ref="input" :type="type" class="wrapper-input" :placeholder="placeHolder" :value="inputValue"
+             @input="onInputChange" @blur="validate" :maxlength="maxLength"/>
     </slot>
   </div>
 </template>
 
 <script>
+const NUMREG = /^[0-9]+([.]{1}[0-9]+){0,1}$/;
+
 export default {
   name: 'CInput',
   props: {
@@ -26,22 +30,56 @@ export default {
         return '';
       }
     },
+    type: {
+      type: String,
+      default() {
+        return '';
+      }
+    },
     placeHolder: {
       type: String,
       default() {
         return '';
       }
+    },
+    showRequired: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
+    required: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
+    maxLength: {
+      type: Number,
+      default() {
+        return 100;
+      }
     }
   },
   data() {
     return {
       inputValue: this.value,
+      tipError: '不能为空',
+      numTipError: '只能为数字',
       error: '不能为空',
-      showError: false
+      showError: false,
+      tip: {
+        required: '（必填）',
+        optional: '（选填）'
+      }
     };
   },
   methods: {
     onInputChange() {
+      if (this.$refs.input.value.length > this.maxLength) {
+        this.$refs.input.value = this.$refs.input.value.slice(0, this.maxLength);
+      }
+
       this.inputValue = this.$refs.input.value;
       this.$emit('input', this.$refs.input.value);
     },
@@ -49,12 +87,28 @@ export default {
       this.showError = status;
     },
     validate() {
+      if (!this.required) {
+        return true;
+      }
+
       if (!this.inputValue) {
+        this.error = this.tipError;
         this.showError = true;
         return false;
       } else {
-        this.showError = false;
-        return true;
+        if (this.type === 'number') {
+          if (NUMREG.test(this.inputValue)) {
+            this.showError = false;
+            return true;
+          } else {
+            this.error = this.numTipError;
+            this.showError = true;
+            return false;
+          }
+        } else {
+          this.showError = false;
+          return true;
+        }
       }
     }
   }
@@ -62,31 +116,33 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .input-label {
+    font-size: 36px;
+    display: inline-block;
+    font-weight: bold;
+  }
 
-.input-label {
-  font-size: 36px;
-  display: inline-block;
-  font-weight: bold;
-}
-
-.wrapper-label {
-  margin-bottom: 30px;
-}
+  .wrapper-label {
+    margin-bottom: 30px;
+  }
 
-.wrapper-input {
-  font-size: 28px;
-  width: 100%;
-  /*line-height: 1;*/
-  line-height: normal;
-}
+  .wrapper-input {
+    font-size: 28px;
+    width: 100%;
+    /*line-height: 1;*/
+    line-height: normal;
+  }
 
-.error {
-  margin-left: 12px;
-  color: #d0021b;
-}
+  .error {
+    margin-left: 12px;
+    color: #d0021b;
+  }
 
-::-webkit-input-placeholder {
-  color: #aaa;
-}
+  .tip {
+    font-size: 20px;
+  }
 
+  ::-webkit-input-placeholder {
+    color: #aaa;
+  }
 </style>

 <template>
-  <CInput ref="label" :label="label">
+  <CInput ref="label" :label="label" :required="required" :show-required="showRequired">
     <slot>
-      <div @click="showImagePreview">
+      <div>
         <Upload
           :max="max"
           :multiple="multiple"
@@ -9,10 +9,10 @@
           :simultaneous-uploads="1"
           :value="file"
           @files-added="filesAdded"
-          @file-submitted="fileSubmit"
           @file-error="fileError"
           @file-success="fileSuccess"
           @file-removed="fileRemove"
+          @file-click="showImagePreview"
         >
         </Upload>
       </div>
@@ -40,27 +40,45 @@ export default {
     },
     label: {
       type: String
+    },
+    max: {
+      type: Number,
+      default() {
+        return 1;
+      }
+    },
+    showRequired: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
+    required: {
+      type: Boolean,
+      default() {
+        return false;
+      }
     }
   },
   data() {
+    let vm = this;
+
     return {
-      max: 1,
       multiple: false,
       action: {
-        target: 'http://upload.qiniup.com/',
-        data: {
-          token: '',
-          key: ''
+        target: '//upload.qiniup.com/',
+        data(file) {
+          return {
+            token: vm.token,
+            key: 'license/' + Date.now() + '/' + file.name
+          };
         }
       },
-      file: this.value
+      file: this.value,
+      initialIndex: 0
     };
   },
   methods: {
-    fileSubmit(file) {
-      this.action.data.token = this.token;
-      this.action.data.key = 'license/' + Date.now() + '/' + file.name;
-    },
     filesAdded(files) {
       let hasIgnore = false;
       const maxSize = 10 * 1024 * 1024; // 10M
@@ -87,6 +105,10 @@ export default {
       }).show();
     },
     validate() {
+      if (!this.required) {
+        return true;
+      }
+
       if (!this.value.length) {
         this.$refs.label.setShowError();
         return false;
@@ -95,19 +117,34 @@ export default {
         return true;
       }
     },
-    showImagePreview() {
-      if (this.value && this.value[0] && this.value[0].response && this.value[0].response.key) {
+    showImagePreview(file) {
+      this.initialIndex = this.file.findIndex(i => file.name === i.name);
+
+      const imgs = this.file.map(f => {
+        return '//img01.yohoboys.com/' + f.response.key + '?imageView2/2/w/450/q/60';
+      });
+
+      if (file && file.response && file.response.key) {
         this.$createImagePreview({
-          imgs: ['//img01.yohoboys.com/' + this.value[0].response.key + '?imageView2/2/w/450/q/60']
+          $props: {
+            imgs,
+            initialIndex: 'initialIndex',
+            loop: false
+          },
+          $events: {
+            change: (i) => {
+              this.initialIndex = i;
+            }
+          }
         }).show();
       }
     },
     fileSuccess(file) {
       file.name = file.response.key;
-      this.$emit('file-change');
+      this.$emit('file-change', file);
     },
     fileRemove(file) {
-      this.$emit('file-change');
+      this.$emit('file-change', file);
     }
   },
   computed: {

@@ -148,6 +148,9 @@ export default {
       } else if (this.skc.suggestMaxPrice && price > this.skc.suggestMaxPrice) {
         this.errorTip = '超出建议价将被限制展示，建议下调至合理价格区间';
         valid = true;
+      } else if (this.skc.leastPrice && price > this.skc.leastPrice) {
+        this.errorTip = '您的出价高于最低售价';
+        valid = true;
       } else {
         this.errorTip = '';
         valid = true;

@@ -3,6 +3,8 @@
     v-model="visiable"
     :loading="fetchingNoSale"
     :transfer="true"
+    sure-text="不卖了"
+    cancel-text="继续出售"
     @on-sure="onSure">
     <div class="change-price-modal">
       <p class="modal-title">选择你要下架的数量</p>

 <template>
   <div class="product-item">
     <div class="item-content" :style="itemStyle" @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd">
-      <div class="tip" v-if="showTip">超出建议售价将被限制展示，建议下调至合理价格区间</div>
+      <div class="tip" v-if="value.tips">{{value.tips}}</div>
       <i class="pre-sale" v-if="isPreSale"></i>
       <div class="info">
         <div class="left">
@@ -43,9 +43,6 @@ export default {
     };
   },
   computed: {
-    showTip() {
-      return this.value.goodsInfo.price > this.value.goodsInfo.suggestMaxPrice;
-    },
     isPreSale() {
       return this.value.isAdvance === 'Y';
     },

@@ -124,12 +124,12 @@ export default {
           type: 'confirm',
           content: '您确定不卖此商品吗？',
           confirmBtn: {
-            text: '取消',
+            text: '继续出售',
             active: true,
             disabled: false,
           },
           cancelBtn: {
-            text: '确定',
+            text: '不卖了',
             active: false,
             disabled: false,
           },

+<template>
+  <UInput ref="label" :label="label" :show-required="showRequired" :required="required">
+    <slot>
+      <div class="wrapper">
+        <input ref="time" type="text" readonly="true" class="input-wrapper" :value="value" :placeholder="placeHolder" @focus="onFocusStartTime" >
+
+        <i v-if="value" class="cubeic-wrong wrong" @click="reset"></i>
+      </div>
+    </slot>
+  </UInput>
+</template>
+
+<script>
+
+import UInput from '../../license/components/input';
+import {DatePicker, Input} from 'cube-ui';
+
+export default {
+  name: 'CSingleDatePick',
+  props: {
+    label: {
+      type: String
+    },
+    value: {
+      type: String,
+      default() {
+        return '';
+      }
+    },
+    showRequired: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
+    required: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
+    placeHolder: {
+      type: String
+    }
+  },
+  data() {
+    return {
+    };
+  },
+  methods: {
+    onFocusStartTime() {
+      if (!this.startDatePicker) {
+        this.startDatePicker = this.$createDatePicker({
+          title: '选择发售时间',
+          min: new Date(1990, 7, 8),
+          max: new Date(2050, 9, 20),
+          value: this.value ? new Date(...this.value.split('/')) : new Date(),
+          onSelect: this.selectStartTimeHandle,
+          onCancel: null
+        });
+      }
+
+      this.startDatePicker.show();
+    },
+    selectStartTimeHandle(date, selectedVal) {
+      this.$refs.time.value = selectedVal.join('/');
+      this.updateTime();
+      this.validate();
+    },
+    updateTime() {
+      this.$emit('input', this.$refs.time.value);
+    },
+    validate() {
+      if (!this.required) {
+        return true;
+      }
+
+      if (this.$refs.start.value) {
+        this.$refs.label.setShowError(false);
+        return true;
+      } else {
+        this.$refs.label.setShowError();
+        return false;
+      }
+    },
+    reset() {
+      this.$refs.time.value = '';
+      this.$emit('input', this.$refs.time.value);
+    }
+  },
+  components: {
+    UInput,
+    CInput: Input,
+    DatePicker
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+
+  .wrapper {
+    width: 100%;
+    font-size: 28px;
+    position: relative;
+  }
+
+  .input-wrapper {
+    display: inline-block;
+    line-height: normal;
+  }
+
+  .cube-picker-panel {
+    /deep/ .cube-picker-confirm {
+      color: black;
+    }
+  }
+
+  .wrong {
+    float: right;
+    color: rgba(0, 0, 0, 0.8);
+    font-size: 16PX;
+    position: absolute;
+    right: 0;
+    top: -2px;
+  }
+</style>

+<template>
+  <div class="form-body">
+
+    <div class="title">新的好物</div>
+
+    <Form ref="form">
+      <FormItem>
+        <CInput label="品牌" :max-length="50" :show-required="true" :required="true" place-holder="例如：Nike, Adidas" v-model="form.brand"></CInput>
+      </FormItem>
+
+      <FormItem>
+        <CInput label="商品名称" :max-length="50" :show-required="true" :required="true" place-holder="例如：Yeezy 350 v2 纯白" v-model="form.product_name"></CInput>
+      </FormItem>
+
+      <FormItem>
+        <CInput label="发售价" :max-length="9" type="number" :show-required="true" :required="false" place-holder="请输入发售价" v-model="form.price"></CInput>
+      </FormItem>
+
+      <FormItem>
+        <CSingleDataPick label="发售时间" :show-required="true" :required="false" place-holder="请选择发售时间" v-model="form.sale_time"></CSingleDataPick>
+      </FormItem>
+
+      <FormItem>
+        <CInput :max-length="50" label="货号" :show-required="true" :required="true" place-holder="例如：CP9366" v-model="form.product_code"></CInput>
+      </FormItem>
+
+      <FormItem>
+        <CUpload label="商品图片" @file-change="fileChange" :show-required="true" :required="true" :max="9" v-model="form.imageList"></CUpload>
+      </FormItem>
+
+    </Form>
+
+    <div :class="submitClass" @click="onSubmit">确认提交</div>
+
+  </div>
+</template>
+
+<script>
+import CUpload from '../../license/components/upload';
+import FormItem from '../../license/components/form-item';
+import Form from '../../license/components/form';
+import CInput from '../../license/components/input';
+import CSingleDataPick from '../components/single-data-pick';
+
+import { createNamespacedHelpers } from 'vuex';
+
+const { mapActions } = createNamespacedHelpers(
+  'license/form'
+);
+
+export default {
+  name: 'UfoFormPage',
+  data() {
+    return {
+      form: {
+        brand: '',
+        product_name: '',
+        price: '',
+        sale_time: '',
+        product_code: '',
+        imageList: [],
+        forceRecomputeCounter: 1
+      }
+    };
+  },
+  components: {
+    Form,
+    FormItem,
+    CUpload,
+    CInput,
+    CSingleDataPick
+  },
+  methods: {
+    async onSubmit() {
+      if (!this.validate()) {
+        return;
+      }
+
+      if (!this.isNotEmpty) {
+        return;
+      }
+
+      this.toast = this.$createToast({
+        type: 'loading',
+        txt: '正在提交中',
+        mask: true
+      }).show();
+
+      const result = await this.createUfoProduct(this.form);
+
+      await this.sleep(1000);
+
+      this.toast && this.toast.hide();
+
+      if (result && result.code === 200) {
+        this.$createToast({
+          type: 'text',
+          txt: '您的好货信息已提交，审核通过会第一时间通知您',
+          mask: true,
+          time: 3000,
+          $events: {
+            timeout: this.finishPage
+          }
+        }).show();
+      } else {
+        this.$createToast({
+          type: 'error',
+          txt: result.message,
+          mask: true
+        }).show();
+      }
+    },
+    ...mapActions(['fetchToken', 'createUfoProduct']),
+    validate() {
+      return this.$refs.form && this.$refs.form.validate();
+    },
+    fileChange() {
+      this.form.forceRecomputeCounter += 1;
+    },
+    sleep(n) {
+      return new Promise((resolve) => {
+        setTimeout(resolve, n);
+      });
+    },
+    finishPage() {
+      this.$yoho.finishPage();
+    }
+  },
+  computed: {
+    submitClass() {
+      return [
+        'footer',
+        {
+          active: this.isNotEmpty
+        }
+      ];
+    },
+    isNotEmpty() {
+      return this.form.forceRecomputeCounter && this.form.brand && this.form.product_name && this.form.product_code &&
+        this.form.imageList.length >= 1 &&
+        this.form.imageList[0] && this.form.imageList[0].response && this.form.imageList[0].response.key;
+    },
+  },
+  mounted() {
+    this.fetchToken();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.form-body {
+  height: 100%;
+  overflow: scroll;
+  -webkit-overflow-scrolling: touch;
+  padding-top: 12px;
+  padding-left: 40px;
+  padding-right: 40px;
+}
+
+.title {
+  font-weight: bold;
+  font-size: 68px;
+  margin-bottom: 42px;
+}
+
+.footer {
+  width: 100%;
+  height: 120px;
+  text-align: center;
+  line-height: 120px;
+  font-size: 28px;
+  margin: 40px 0;
+  color: white;
+  background-color: #ccc;
+
+  &.active {
+    background-color: #002b47;
+  }
+}
+</style>

+import Form from './form.vue';
+
+export default Form;

+
+export default [{
+  path: '/mapp/selfufo.html',
+  name: 'selfUfo',
+  component: () => import(/* webpackChunkName: "selfUfo" */ './selfUfo')
+}];

+<template>
+  <LayoutApp :fixscroll="true">
+      <FormPage></FormPage>
+  </LayoutApp>
+</template>
+
+<script>
+import FormPage from './form';
+import LayoutApp from '../components/layout/layout-app';
+
+export default {
+  name: 'selUfoPage',
+  components: {
+    LayoutApp,
+    FormPage
+  }
+};
+
+</script>
+
+<style lang="scss" scoped>
+</style>

@@ -42,7 +42,10 @@ export default {
     let result = await this.$api.get('/api/ufo/license/status');
 
     if (result.code === 200) {
-      commit(Types.FETCH_UFO_STATUS_SUCCESS, { status: result.data, message: result.message });
+      commit(Types.FETCH_UFO_STATUS_SUCCESS, {
+        status: result.data,
+        message: result.message
+      });
     } else {
       commit(Types.FETCH_UFO_STATUS_SUCCESS, { status: -1 });
     }
@@ -58,5 +61,16 @@ export default {
     }
 
     return result;
+  },
+
+  async createUfoProduct(params, data) {
+    return this.$api.post('/api/ufo/seller/create', {
+      brand: data.brand,
+      product_name: data.product_name,
+      price: data.price,
+      sale_time: data.sale_time,
+      product_code: data.product_code,
+      imageList: data.imageList.map(_url).join(',')
+    });
   }
 };

@@ -91,4 +91,10 @@ module.exports = {
     params: {
     }
   },
+  '/api/ufo/seller/create': {
+    ufo: true,
+    api: 'ufo.selfShelves.save',
+    params: {
+    }
+  },
 };

@@ -13,5 +13,8 @@ module.exports = [
   },
   {
     route: /mapp\/alipayform.html/
+  },
+  {
+    route: /mapp\/selfufo.html/
   }
 ];