团购商品增加实物商品，及团购商品是否配置实物bug

src/components/shop/dialog.vue

@@ -38,6 +38,10 @@
                   :label="'优惠券商品'"
                   :value="4">
                 </el-option>
+                 <el-option
+                  :label="'实物商品'"
+                  :value="5">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -78,7 +82,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.goods_type !== 3 && form.goods_type !== 4">
+        <el-row v-if="form.goods_type !== 3 && form.goods_type !== 4 && form.goods_type !== 5">
           <el-col :span="12">
             <el-form-item label="课程类型">
               <el-select v-model="form.course_type" placeholder="请选择" @change="changeLessonType()">
@@ -106,7 +110,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.goods_type !== 3 && form.goods_type !== 4">
+        <el-row v-if="form.goods_type !== 3 && form.goods_type !== 4  && form.goods_type !== 5">
           <el-col :span="12">
             <el-form-item label="观看时长(节)">
               <el-input-number v-model="form.watch_num" label="课时数"></el-input-number>
@@ -118,7 +122,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="课程封面(670*472)" v-if="form.goods_type !== 3 && form.goods_type !== 4">
+        <el-form-item label="课程封面(670*472)" v-if="form.goods_type !== 3 && form.goods_type !== 4  && form.goods_type !== 5">
           <el-upload
             list-type="picture-card"
             class="upload-demo"
@@ -158,7 +162,7 @@
         <el-form-item label="推荐奖金(元)" v-if="form.goods_type === 1">
           <el-input-number v-model="form.invite_earnings" label="推荐奖金"></el-input-number>
         </el-form-item>
-        <el-form-item label="是否配置实物" v-if="form.goods_type === 1">
+        <el-form-item label="是否配置实物" v-if="form.goods_type === 1 || form.goods_type === 2">
           <el-switch
             v-model="form.is_real"
             :active-value="1"
@@ -188,12 +192,12 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="form.goods_type === 1 || form.goods_type === 3 ? '原价(元)' :form.goods_type === 4 ? '抵扣价格(元)' : '单买价格(元)'">
+            <el-form-item :label="form.goods_type === 1 || form.goods_type === 3 || form.goods_type === 5 ? '原价(元)' :form.goods_type === 4 ? '抵扣价格(元)' : '单买价格(元)'">
               <el-input-number v-model="form.original_price" label="原价"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="form.goods_type === 1  || form.goods_type === 3 ? '现价(元)' :form.goods_type === 4 ? '购买价格(元)' : '拼团价格(元)'">
+            <el-form-item :label="form.goods_type === 1  || form.goods_type === 3 || form.goods_type === 5 ? '现价(元)' :form.goods_type === 4 ? '购买价格(元)' : '拼团价格(元)'">
               <el-input-number v-model="form.current_price" label="现价"></el-input-number>
             </el-form-item>
           </el-col>
@@ -210,7 +214,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  v-if="form.goods_type !== 3">
+        <el-row  v-if="form.goods_type !== 3 || form.goods_type !== 5">
           <el-col :span="12">
             <el-form-item label="分享标题">
               <el-input v-model="form.share_desc.title"></el-input>
@@ -222,7 +226,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="分享主图(300*300)" v-if="form.goods_type !== 3">
+        <el-form-item label="分享主图(300*300)" v-if="form.goods_type !== 3 || form.goods_type !== 5">
           <el-upload
             list-type="picture-card"
             action="/api/public/upload"
@@ -232,7 +236,7 @@
             <i class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="分享海报" v-if="form.goods_type !== 3">
+        <el-form-item label="分享海报" v-if="form.goods_type !== 3 || form.goods_type !== 5">
           <el-upload
             list-type="picture-card"
             action="/api/public/upload"
@@ -314,6 +318,7 @@
           current_price:'',
           is_real:0,
           is_auth_user:0,
+          is_auth_teacher:0,
           share_desc:{
             title:'',
             content:'',
@@ -338,10 +343,13 @@
     methods:{
       sub(){
         let _json = JSON.parse(JSON.stringify(this.form)+'');
-        if(_json.goods_type === 3 || _json.goods_type === 4 ){
+        if(_json.goods_type === 3 || _json.goods_type === 4 || _json.goods_type === 5){
           _json.course_id=0;
           _json.watch_num = 0;
         }
+        if(_json.goods_type === 5){
+          _json.is_real=1;
+        }
         _json.desc.before_goods_id = this.goOn_goods_Id.before_goods_id;
         if(this.goodsYou.length < 1){
           _json.desc.use_goods_ids = ''
@@ -355,6 +363,7 @@
         _json.goods_desc = JSON.stringify(_json.goods_desc);
         _json.desc = JSON.stringify(_json.desc);
         _json.share_desc = JSON.stringify(_json.share_desc);
+        console.log(_json)
         switch(this.dialogObj.type){
           case 1:
             editGoodsApi(this.dialogObj.id,_json).then(res=>{
@@ -505,6 +514,7 @@
               current_price:'',
               is_real:0,
               is_auth_user:0,
+              is_auth_teacher:0,
               share_desc:{
                 title:'',
                 content:'',
@@ -540,6 +550,7 @@
             current_price:'',
             is_real:0,
             is_auth_user:0,
+            is_auth_teacher:0,
             share_desc:{
               title:'',
               content:'',

src/components/shop/index.vue

@@ -23,6 +23,10 @@
                 :label="'优惠券商品'"
                 :value="4">
               </el-option>
+               <el-option
+                :label="'实物商品'"
+                :value="5">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="课程">

src/components/smsRecord/index.vue

@@ -14,7 +14,7 @@
           <el-form-item label="手机号">
             <el-input v-model="searchFrom.mobile"  @change="getList"></el-input>
           </el-form-item>
-          <el-form-item label="发送状态">
+          <el-form-item label="发送结果">
             <el-select v-model="searchFrom.status" placeholder="请选择" @change="getList" clearable>
               <el-option
                 v-for="item in useTypeList"
@@ -31,10 +31,6 @@
     <el-table
       :data="list"
       style="width: 100%">
-      <el-table-column
-        prop="id"
-        label="发送编号">
-      </el-table-column>
       <el-table-column
         prop="mobile"
         label="手机号">
@@ -44,9 +40,18 @@
         label="短信验证码">
       </el-table-column>
        <el-table-column
-        label="发送状态">
+        prop="nickname"
+        label="发送人">
+      </el-table-column>
+      <el-table-column
+        label="发送结果">
         <template slot-scope="scope">
+          <div v-if="scope.row.status==0">
             {{scope.row.status | filterStatus}}
+          </div>
+          <div v-if="scope.row.status != 0">
+            {{scope.row.status | filterStatus}} / {{scope.row.result}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -74,11 +79,11 @@
         useTypeList:[
           {
             status:0,
-            value:'成功'
+            value:'发送成功'
           },
           {
             status:1,
-            value:'失败'
+            value:'发送失败'
           },
         ],
         TypeList:[
@@ -99,9 +104,9 @@
       filterStatus:function (value) {
         let msg = '';
         if(value === 0){
-          msg = '成功'
+          msg = '发送成功'
         }else{
-          msg = '失败'
+          msg = '发送失败'
         }
         return msg;
       }
@@ -134,6 +139,7 @@
            json.mobile = this.searchFrom.mobile
          }
          getsmsRecordApi(json).then((res)=>{
+           console.log(res.list)
            this.total = res.total;
            this.list = res.list ? res.list : []
          })

src/components/yunji/index.vue

@@ -242,7 +242,6 @@ export default {
         json.pull_end_at = this.searchFrom.syncTime[1];
       }
       getyunjiApi(json).then(res => {
-        console.log(res.list);
         this.total = res.total;
         this.list = res.list ? res.list : [];
         console.log(res)

src/util/wordbook.js

@@ -17,6 +17,7 @@ export const GOODSTYPE = {
   '2':'团购商品',
   '3':'续课商品',
   '4':'优惠券商品',
+  '5':'实物商品',
 };
 export const ISORNOT = {
   '0':'否',