tijiao

package.json

@@ -24,12 +24,12 @@
     "gulp-replace": "1.0.0",
     "gulp-shell": "0.8.0",
     "lodash": "4.17.5",
-    "node-sass": "^4.0.0",
+    "node-sass": "^4.14.1",
     "npm": "^6.9.0",
     "quill-image-resize-module": "^3.0.0",
     "sass-loader": "6.0.6",
     "svg-sprite-loader": "3.7.3",
-    "vue": "^2.6.14",
+    "vue": "^2.7.16",
     "vue-audio": "^0.0.12",
     "vue-cookie": "1.1.4",
     "vue-quill-editor": "^3.0.6",
@@ -50,11 +50,14 @@
     "babel-preset-env": "1.3.2",
     "babel-preset-stage-2": "6.22.0",
     "babel-register": "6.22.0",
+    "braces": "^3.0.3",
+    "cache-base": "^4.0.2",
     "chalk": "2.3.0",
-    "chromedriver": "2.27.2",
+    "chromedriver": "^2.27.2",
     "copy-webpack-plugin": "4.0.1",
     "cross-spawn": "5.0.1",
     "css-loader": "0.28.0",
+    "define-property": "^2.0.2",
     "eslint": "3.19.0",
     "eslint-config-standard": "10.2.1",
     "eslint-friendly-formatter": "3.0.0",
@@ -68,19 +71,28 @@
     "extract-text-webpack-plugin": "3.0.0",
     "file-loader": "1.1.4",
     "friendly-errors-webpack-plugin": "1.6.1",
+    "gulp": "^5.0.1",
+    "gulp-cli": "^3.1.0",
+    "gulp-load-plugins": "^2.0.8",
     "html-webpack-plugin": "2.30.1",
+    "is-absolute": "^1.0.0",
+    "isobject": "^4.0.0",
     "jest": "21.2.0",
     "jest-serializer-vue": "0.3.0",
     "less": "^4.1.3",
     "less-loader": "^5.0.0",
+    "mixin-deep": "^2.0.1",
     "nightwatch": "0.9.12",
     "node-notifier": "5.1.2",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.2.0",
+    "pascalcase": "^2.0.0",
     "portfinder": "1.0.13",
     "postcss-import": "11.0.0",
     "postcss-loader": "2.0.8",
+    "ret": "^0.5.0",
     "rimraf": "2.6.0",
+    "safe-regex": "^2.1.1",
     "selenium-server": "3.0.1",
     "semver": "5.3.0",
     "shelljs": "0.7.6",
@@ -89,7 +101,7 @@
     "vue-jest": "1.0.2",
     "vue-loader": "13.3.0",
     "vue-style-loader": "3.0.1",
-    "vue-template-compiler": "2.6.14",
+    "vue-template-compiler": "^2.7.16",
     "webpack": "3.6.0",
     "webpack-bundle-analyzer": "2.9.0",
     "webpack-dev-server": "2.9.1",

src/views/modules/book/book-add-or-update.vue

@@ -128,8 +128,14 @@
 
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="付费价格" prop="abroadPrice">
+   
-        <el-input v-model="dataForm.abroadPrice" placeholder="付费价格（美元）"></el-input>
+      <el-form-item label="付费价格" prop="abroadPriceId">
+        <el-select v-model="dataForm.abroadPriceId"  filterable allow-create default-first-option
+              placeholder="请选择付费价格（NZD）">
+              <el-option v-for="item in priceList" :key="item.id + ''" :label="item.dictValue+' NZD'" :value="item.id+''">
+              </el-option>
+            </el-select>
+        <!-- <el-input v-model="dataForm.abroadPrice" placeholder="付费价格（美元）"></el-input> -->
       </el-form-item>
       <el-form-item label="付费类型" prop="isVip">
         <el-radio-group v-model="dataForm.isVip">
@@ -250,6 +256,7 @@
         restaurants: [],
         author: '',
         publisherList: [],
+        priceList: [],
         fileList: [],
         fileListNovel: [],
         dialogImageUrl: '',
@@ -285,7 +292,8 @@
           clockIn: 2,
           teachIn: 0,
           relationId:0,
-          abroadPrice: ''
+          abroadPrice: '',
+          abroadPriceId: '',
         },
         splitsTypeList: [],
         dataRule: {
@@ -394,6 +402,7 @@
                 this.dataForm.relationId = data.book.relationId
                 this.dataForm.abroadPrice = data.book.abroadPrice  //价格
                 var checklist = data.book.type
+                this.dataForm.abroadPriceId=data.book.abroadPriceId
                 var medicaldeschecklist = data.book.medicaldesBookType
                 var authorList = data.book.authorId
                 var publisherlish = data.book.publisherId
@@ -427,6 +436,9 @@
                   attr.push(novel)
                   this.fileListNovel = attr
                 }
+            
+                  
+                
               }
             })
           }
@@ -460,9 +472,13 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             //价格逻辑
-            let abroadPrice = this.formatNumber(Number(this.dataForm.abroadPrice));
+            // let abroadPrice = this.formatNumber(Number(this.dataForm.abroadPrice));
-            if(!abroadPrice&&abroadPrice!=0){
+            // if(!abroadPrice&&abroadPrice!=0){
-              return
+            //   return
+            // }
+            if(!this.dataForm.abroadPriceId){
+              this.$message.error('请选择付费价格')
+              return false
             }
             this.$http({
               url: this.$http.adornUrl(`/book/book/${!this.dataForm.id ? 'save' : 'update'}`),
@@ -498,7 +514,8 @@
                 'relationId': this.dataForm.relationId,
                 'clockIn': this.dataForm.clockIn,
                 'teachIn': this.dataForm.teachIn,
-                'abroadPrice': abroadPrice  //价格
+              
+                abroadPriceId:this.dataForm.abroadPriceId,
               })
             }).then(({
               data
@@ -624,6 +641,19 @@
         }) => {
           this.publisherList = data.list
         })
+        this.$http({
+              url: this.$http.adornUrl('/book/sysdictdata/getData'),
+              method: 'post',
+              data: this.$http.adornData({
+                'dictLabel': 'googleProduct',
+                
+              })
+            })
+      .then(({
+          data
+        }) => {
+          this.priceList = data.sysDictDatas
+        })
 
       },
       // handleSelect(item) {

src/views/modules/book/book.vue

@@ -34,7 +34,7 @@
       <el-table-column prop="authorName" header-align="center" align="center" label="作者姓名" width="120">
       </el-table-column>
       <el-table-column prop="abroadPrice" header-align="center" align="center" label="付费价格" width="120">
-        <template slot-scope="scope">${{ scope.row.abroadPrice }}</template>
+        <template slot-scope="scope">${{ scope.row.priceData.dictValue }} NZD</template>
       </el-table-column>
       <el-table-column header-align="center" align="center" label="插图" width="100">
         <template slot-scope="scope">