achao hace 1 año
padre
commit
ebd6c1e1ac
Se han modificado 57 ficheros con 205 adiciones y 99 borrados
  1. 4 2
      unimall-admin/config/dev.env.js
  2. BIN
      unimall-admin/dist/dist.zip
  3. 0 0
      unimall-admin/dist/index.html
  4. 0 0
      unimall-admin/dist/static/css/chunk-0d12.fee324e7.css
  5. 0 0
      unimall-admin/dist/static/css/chunk-1aa7.4986c348.css
  6. 0 0
      unimall-admin/dist/static/css/chunk-22eb.b2cfae93.css
  7. 0 0
      unimall-admin/dist/static/css/chunk-451a.76a9b3f0.css
  8. 0 0
      unimall-admin/dist/static/css/chunk-451b.7473bdb6.css
  9. 0 0
      unimall-admin/dist/static/css/chunk-4d5f.77f4eae2.css
  10. 0 0
      unimall-admin/dist/static/css/chunk-4f56.312b526c.css
  11. 0 0
      unimall-admin/dist/static/css/chunk-57c5.dbff8ecc.css
  12. 0 0
      unimall-admin/dist/static/css/chunk-6101.b8c1055c.css
  13. 0 0
      unimall-admin/dist/static/css/chunk-6621.4c89550f.css
  14. 0 0
      unimall-admin/dist/static/css/chunk-7311.2172b911.css
  15. 0 0
      unimall-admin/dist/static/css/chunk-c1dc.15fc4fe5.css
  16. 0 0
      unimall-admin/dist/static/css/chunk-d125.8c2c0059.css
  17. 0 0
      unimall-admin/dist/static/css/chunk-f446.a46e7338.css
  18. 1 1
      unimall-admin/dist/static/js/UZQo.d42af3a6.js
  19. 0 0
      unimall-admin/dist/static/js/app.5f74bbe9.js
  20. 0 0
      unimall-admin/dist/static/js/app.8d390d59.js
  21. 0 0
      unimall-admin/dist/static/js/chunk-03fa.e5ff7dd0.js
  22. 0 0
      unimall-admin/dist/static/js/chunk-03fb.554dfea5.js
  23. 0 0
      unimall-admin/dist/static/js/chunk-04d5.bd811a8c.js
  24. 0 0
      unimall-admin/dist/static/js/chunk-0d12.8ed96eb9.js
  25. 0 0
      unimall-admin/dist/static/js/chunk-0f1b.fc97e3d9.js
  26. 0 0
      unimall-admin/dist/static/js/chunk-17bc.7741fa37.js
  27. 0 0
      unimall-admin/dist/static/js/chunk-1aa7.4d43bf42.js
  28. 0 0
      unimall-admin/dist/static/js/chunk-22eb.c594be3e.js
  29. 0 0
      unimall-admin/dist/static/js/chunk-312e.299ae270.js
  30. 0 0
      unimall-admin/dist/static/js/chunk-3f3d.b7a30566.js
  31. 0 0
      unimall-admin/dist/static/js/chunk-451a.caa1d3d3.js
  32. 0 0
      unimall-admin/dist/static/js/chunk-451b.54c91632.js
  33. 0 0
      unimall-admin/dist/static/js/chunk-4d5f.e308c1e5.js
  34. 0 0
      unimall-admin/dist/static/js/chunk-4f56.6b02ca42.js
  35. 0 0
      unimall-admin/dist/static/js/chunk-51e3.f7a27a2e.js
  36. 1 0
      unimall-admin/dist/static/js/chunk-57c5.974f5957.js
  37. 0 1
      unimall-admin/dist/static/js/chunk-5e99.7442b10e.js
  38. 0 0
      unimall-admin/dist/static/js/chunk-6101.5ccab44f.js
  39. 0 0
      unimall-admin/dist/static/js/chunk-6621.bed0a55e.js
  40. 0 0
      unimall-admin/dist/static/js/chunk-6a9f.a6ceab0c.js
  41. 0 0
      unimall-admin/dist/static/js/chunk-7311.23b2856c.js
  42. 0 0
      unimall-admin/dist/static/js/chunk-7eec.9efcfa66.js
  43. 0 0
      unimall-admin/dist/static/js/chunk-c1dc.3b27b14d.js
  44. 0 0
      unimall-admin/dist/static/js/chunk-d125.31b3aa5d.js
  45. 0 0
      unimall-admin/dist/static/js/chunk-d187.a10f6981.js
  46. 0 0
      unimall-admin/dist/static/js/chunk-e67c.457d8830.js
  47. 0 0
      unimall-admin/dist/static/js/chunk-elementUI.51ef68d6.js
  48. 0 0
      unimall-admin/dist/static/js/chunk-f446.ac338e45.js
  49. 6 6
      unimall-admin/src/router/index.js
  50. 29 17
      unimall-admin/src/views/gubi/transaction/index.vue
  51. 78 25
      yinyuan/components/yunmiao-jobSelect/yunmiao-jobSelect.vue
  52. 1 1
      yinyuan/config/index.js
  53. 23 17
      yinyuan/index.html
  54. 4 1
      yinyuan/manifest.json
  55. 0 6
      yinyuan/pages/index/index.vue
  56. 55 18
      yinyuan/pages/index/price.vue
  57. 3 4
      yinyuan/pages/login/login.vue

+ 4 - 2
unimall-admin/config/dev.env.js

@@ -1,6 +1,8 @@
 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    HOST: '"http://192.168.110.82:8181"',
-    BASE_API: '"http://192.168.110.82:8181/m.api"'
+    // HOST: '"http://192.168.110.82:8181"',
+    // BASE_API: '"http://192.168.110.82:8181/m.api"'
+    HOST: '"http://121.5.163.150:8181"',
+    BASE_API: '"http://121.5.163.150:8181/m.api"'
 }

BIN
unimall-admin/dist/dist.zip


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/index.html


+ 0 - 0
unimall-admin/dist/static/css/chunk-0d12.8dd2cfd4.css → unimall-admin/dist/static/css/chunk-0d12.fee324e7.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-192f.02e44736.css → unimall-admin/dist/static/css/chunk-1aa7.4986c348.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-1f81.6c259890.css → unimall-admin/dist/static/css/chunk-22eb.b2cfae93.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/css/chunk-451a.76a9b3f0.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-451b.49e54d27.css → unimall-admin/dist/static/css/chunk-451b.7473bdb6.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-4d5f.dfb82da7.css → unimall-admin/dist/static/css/chunk-4d5f.77f4eae2.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-4f56.f42c833d.css → unimall-admin/dist/static/css/chunk-4f56.312b526c.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-5e99.2c2132c2.css → unimall-admin/dist/static/css/chunk-57c5.dbff8ecc.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-6101.650f44f8.css → unimall-admin/dist/static/css/chunk-6101.b8c1055c.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-62b7.5ecfa458.css → unimall-admin/dist/static/css/chunk-6621.4c89550f.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-7311.7473bdb6.css → unimall-admin/dist/static/css/chunk-7311.2172b911.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-c1dc.b126e1c1.css → unimall-admin/dist/static/css/chunk-c1dc.15fc4fe5.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-d125.f12b97fc.css → unimall-admin/dist/static/css/chunk-d125.8c2c0059.css


+ 0 - 0
unimall-admin/dist/static/css/chunk-f446.37fc8c44.css → unimall-admin/dist/static/css/chunk-f446.a46e7338.css


+ 1 - 1
unimall-admin/dist/static/js/UZQo.85cdbf52.js → unimall-admin/dist/static/js/UZQo.d42af3a6.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["UZQo"],{UZQo:function(t,e,i){"use strict";i.r(e);var n={name:"Druid",data:function(){return{src:"http://123.56.171.94:8181/druid/index.html",height:document.documentElement.clientHeight-94.5+"px;",loading:!0}},mounted:function(){var t=this;setTimeout(function(){t.loading=!1},230);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=i("KHd+"),a=Object(o.a)(n,function(){var t=this.$createElement,e=this._self._c||t;return e("div",{directives:[{name:"loading",rawName:"v-loading",value:this.loading,expression:"loading"}],style:"height:"+this.height},[e("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:this.src,frameborder:"no",scrolling:"auto"}})])},[],!1,null,null,null);a.options.__file="index.vue";e.default=a.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([["UZQo"],{UZQo:function(t,e,i){"use strict";i.r(e);var n={name:"Druid",data:function(){return{src:"http://121.5.163.150:8181/druid/index.html",height:document.documentElement.clientHeight-94.5+"px;",loading:!0}},mounted:function(){var t=this;setTimeout(function(){t.loading=!1},230);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=i("KHd+"),a=Object(o.a)(n,function(){var t=this.$createElement,e=this._self._c||t;return e("div",{directives:[{name:"loading",rawName:"v-loading",value:this.loading,expression:"loading"}],style:"height:"+this.height},[e("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:this.src,frameborder:"no",scrolling:"auto"}})])},[],!1,null,null,null);a.options.__file="index.vue";e.default=a.exports}}]);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/app.5f74bbe9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/app.8d390d59.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-03fa.e5ff7dd0.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-03fb.554dfea5.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-04d5.bd811a8c.js


+ 0 - 0
unimall-admin/dist/static/js/chunk-0d12.c942b446.js → unimall-admin/dist/static/js/chunk-0d12.8ed96eb9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-0f1b.fc97e3d9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-17bc.7741fa37.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-1aa7.4d43bf42.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-22eb.c594be3e.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-312e.299ae270.js


+ 0 - 0
unimall-admin/dist/static/js/chunk-3f3d.6fb8e198.js → unimall-admin/dist/static/js/chunk-3f3d.b7a30566.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-451a.caa1d3d3.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-451b.54c91632.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-4d5f.e308c1e5.js


+ 0 - 0
unimall-admin/dist/static/js/chunk-4f56.a94c3d38.js → unimall-admin/dist/static/js/chunk-4f56.6b02ca42.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-51e3.f7a27a2e.js


+ 1 - 0
unimall-admin/dist/static/js/chunk-57c5.974f5957.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-57c5"],{QH6g:function(n,t,r){"use strict";var e=r("rUqk");r.n(e).a},RYB4:function(n,t,r){"use strict";r.r(t);var e={components:{},data:function(){return{src:"http://121.5.163.150:8181/info/"}}},s=(r("QH6g"),r("KHd+")),c=Object(s.a)(e,function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"app-container"},[t("iframe",{attrs:{src:this.src,frameborder:"no",border:"0"}})])},[],!1,null,null,null);c.options.__file="api.vue";t.default=c.exports},rUqk:function(n,t,r){}}]);

+ 0 - 1
unimall-admin/dist/static/js/chunk-5e99.7442b10e.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-5e99"],{QH6g:function(n,t,r){"use strict";var e=r("rUqk");r.n(e).a},RYB4:function(n,t,r){"use strict";r.r(t);var e={components:{},data:function(){return{src:"http://123.56.171.94:8181/info/"}}},s=(r("QH6g"),r("KHd+")),i=Object(s.a)(e,function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"app-container"},[t("iframe",{attrs:{src:this.src,frameborder:"no",border:"0"}})])},[],!1,null,null,null);i.options.__file="api.vue";t.default=i.exports},rUqk:function(n,t,r){}}]);

+ 0 - 0
unimall-admin/dist/static/js/chunk-6101.faf47114.js → unimall-admin/dist/static/js/chunk-6101.5ccab44f.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-6621.bed0a55e.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-6a9f.a6ceab0c.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-7311.23b2856c.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-7eec.9efcfa66.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-c1dc.3b27b14d.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-d125.31b3aa5d.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-d187.a10f6981.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-e67c.457d8830.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-elementUI.51ef68d6.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unimall-admin/dist/static/js/chunk-f446.ac338e45.js


+ 6 - 6
unimall-admin/src/router/index.js

@@ -84,7 +84,7 @@ export const constantRouterMap = [{
             name: 'Dashboard',
             meta: { title: '分类管理', icon: 'dashboard', noCache: true }
         }],
-        hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+        hidden: localStorage.getItem('user') == 'xinxi' ? true : false
     },
     {
         path: '/three',
@@ -97,7 +97,7 @@ export const constantRouterMap = [{
             name: 'three',
             meta: { title: '币种信息', icon: 'dashboard', noCache: true }
         }],
-        hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+        hidden: localStorage.getItem('user') == 'xinxi' ? true : false
     },
     {
         path: '/priceHis',
@@ -110,7 +110,7 @@ export const constantRouterMap = [{
             name: 'priceHis',
             meta: { title: '历史价格', icon: 'dashboard', noCache: true }
         }],
-        hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+        hidden: localStorage.getItem('user') == 'xinxi' ? true : false
     },
     {
         path: '/transaction',
@@ -135,7 +135,7 @@ export const constantRouterMap = [{
             name: 'loginRecord',
             meta: { title: '登录记录', icon: 'dashboard', noCache: true }
         }],
-        hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+        hidden: localStorage.getItem('user') == 'xinxi' ? true : false
     }
 ]
 
@@ -188,7 +188,7 @@ const parseJson = () => {
             },
             'name': 'sysManage',
             'alwaysShow': true,
-            hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+            hidden: localStorage.getItem('user') == 'xinxi' ? true : false
         },
         {
             'redirect': 'noredirect',
@@ -215,7 +215,7 @@ const parseJson = () => {
                     ]
                 }
             }],
-            hidden: localStorage.getItem('user') == 'xiaomei' ? true : false
+            hidden: localStorage.getItem('user') == 'xinxi' ? true : false
         },
         {
             'redirect': 'noredirect',

+ 29 - 17
unimall-admin/src/views/gubi/transaction/index.vue

@@ -27,16 +27,16 @@
           size="small"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!-- <el-form-item label="分值" prop="grade">
+      <el-form-item label="名称" prop="grade">
         <el-input
           v-model="queryParams.grade"
-          placeholder="请输入分值"
+          placeholder="请输入名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <el-form-item label="时间" prop="collection">
+      </el-form-item>
+      <!-- <el-form-item label="时间" prop="collection">
         <el-date-picker
           v-model="queryParams.collection"
           clearable
@@ -61,7 +61,7 @@
           clearable
           size="small"
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
@@ -163,15 +163,15 @@
       <!-- <el-table-column label="" align="center" prop="id" />
       <el-table-column label="" align="center" prop="companyId" /> -->
       <!-- <el-table-column label="分值id" align="center" prop="orderId" /> -->
-      <el-table-column label="分类" align="center" prop="strFlag" />
+      <el-table-column label="分类" align="center" prop="strFlag" width="300"/>
       <el-table-column label="编号" align="center" prop="number" />
-      <el-table-column label="分值" align="center" prop="grade" />
-      <el-table-column label="时间" align="center" prop="collection" width="180">
+      <el-table-column label="名称" align="center" prop="grade" />
+      <el-table-column label="时间" align="center" prop="collection">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.collection) }}</span>
+          <span>{{ parseTime(scope.row.collection).split(' ')[0] }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="价钱(万元)" align="center" prop="price" width="120" />
+      <el-table-column label="价钱(万元)" align="center" prop="price" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column align="center" property="urlPath" label="图片">
         <template slot-scope="scope">
@@ -212,8 +212,8 @@
     <pagination
       v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList" />
 
     <!-- 添加或修改交易记录对话框 -->
@@ -321,7 +321,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible" title="分值">
+    <el-dialog :visible.sync="dialogFormVisible" title="名称">
       <el-form :model="form">
         <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"/>
       </el-form>
@@ -415,8 +415,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         companyId: undefined,
         orderId: undefined,
         number: undefined,
@@ -582,11 +582,15 @@ export default {
         userId: undefined,
         adminId: undefined
       }
+      this.value1 = ''
+      this.value2 = ''
+      this.value3 = ''
+      this.imgsFileList = []
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */
@@ -610,12 +614,16 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      this.imgsFileList = []
       const id = row.id || this.ids.join(',')
       getTransaction(id).then(response => {
         this.form = response.data.data
         if (this.form.urlPath) {
           this.form.urlPath = this.form.urlPath.split(',')
+          this.imgsFileList.push(
+            {
+              url: this.form.urlPath
+            }
+          )
         } else {
           this.form.urlPath = []
         }
@@ -630,6 +638,10 @@ export default {
         if (valid) {
           console.log()
           this.form.urlPath = this.form.urlPath.toString()
+          if (!this.form.orderId) {
+            this.msgError('三级分类不能为空!')
+            return
+          }
           if (this.form.id != undefined) {
             updateTransaction(this.form).then(response => {
               if (response.data) {

+ 78 - 25
yinyuan/components/yunmiao-jobSelect/yunmiao-jobSelect.vue

@@ -9,8 +9,9 @@
 			<view class="search-warp" v-if="showAction">
 				<scroll-view scroll-y :style="{'height': scrollHeight+'px'}" class="item-container">
 					<view class="thumb-box" v-for="(item, index) in searchList" :key="index" @click="selval(item)">
+						<!-- {{item}} -->
 						<view :class="[value==item[valueName]? 'item-active' : '']">
-							<text>{{item.pname}}-{{item[labelName]}}</text>
+							<text>{{item.secondName}}</text>
 						</view>
 						<u-icon v-if="value==item[valueName]" name="checkbox-mark" :color="iconColor" size="28">
 						</u-icon>
@@ -19,18 +20,18 @@
 			</view>
 			<view class="u-menu-wrap">
 				<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
-					<view v-for="(item,index) in list" :key="index" class="u-tab-item"
+					<view v-for="(item,index) in first" :key="index" class="u-tab-item"
 						:class="[current==index ? 'u-tab-item-active' : '']" :data-current="index"
-						@tap.stop="swichMenu(index)">
+						@tap.stop="swichMenu(index,item)">
 						<text class="u-line-2">{{item[labelName]}}</text>
 					</view>
 				</scroll-view>
-				<block v-for="(item,index) in list" :key="index">
+				<block v-for="(item,index) in first" :key="index">
 					<scroll-view scroll-y class="right-box" v-if="current==index">
 						<view class="page-view">
 							<view class="class-item">
 								<view class="item-container">
-									<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
+									<view class="thumb-box" v-for="(item1, index1) in second" :key="index1"
 										@click="selval(item1)">
 										<view :class="[value==item1[valueName] ? 'item-active' : '']"
 											class="img-content">
@@ -38,7 +39,7 @@
 												class="img">
 											</image>
 											<text class="right-text"
-												style="margin-left: 20rpx;">{{item1[labelName]}}</text>
+												style="margin-left: 20rpx;">{{item1.secondName}}</text>
 										</view>
 										<!-- <u-icon v-if="value==item1[valueName]" name="checkbox-mark" :color="iconColor"
 											size="28">
@@ -81,10 +82,24 @@
 				default: () => {
 					return [];
 				}
+			},
+			typeOneData: {
+				type: Array,
+				default: () => {
+					return [];
+				}
+			},
+			typeTwoData: {
+				type: Array,
+				default: () => {
+					return [];
+				}
 			}
 		},
 		data() {
 			return {
+				first: JSON.parse(JSON.stringify(this.typeOneData)),
+				second: JSON.parse(JSON.stringify(this.typeTwoData)),
 				showModel: true,
 				list: JSON.parse(JSON.stringify(this.listData)),
 				scrollTop: 0, //tab标题的滚动条位置
@@ -105,6 +120,18 @@
 					this.list = JSON.parse(JSON.stringify(newName))
 				},
 				deep: true,
+			},
+			typeOneData: {
+				handler(newName, oldName) {
+					this.first = JSON.parse(JSON.stringify(newName))
+				},
+				deep: true,
+			},
+			typeTwoData: {
+				handler(newName, oldName) {
+					this.second = JSON.parse(JSON.stringify(newName))
+				},
+				deep: true,
 			}
 		},
 		created() {
@@ -140,16 +167,35 @@
 				this.$emit('confirem', item);
 			},
 			// 点击左边的栏目切换
-			async swichMenu(index) {
-				if (index == this.current) return;
-				this.current = index;
-				// 如果为0,意味着尚未初始化
-				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-					await this.getElRect('u-tab-item', 'menuItemHeight');
-				}
-				// 将菜单菜单活动item垂直居中
-				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+			async swichMenu(index, val) {
+				this.$request.baseRequest('admin.gubi.gubiTypeSecond', 'list', {
+						page: 1,
+						limit: 1000,
+						typeId: val.id
+					},
+					failres => {
+						console.log('res+++++', failres.errmsg)
+						this.$refs.uToast.show({
+							type: 'error',
+							message: failres.errmsg,
+						})
+						uni.hideLoading()
+					}).then(res => {
+
+					console.log(res.data.items)
+					this.second = res.data.items
+					if (index == this.current) return;
+					this.current = index;
+					// 如果为0,意味着尚未初始化
+					if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+						this.getElRect('menu-scroll-view', 'menuHeight');
+						this.getElRect('u-tab-item', 'menuItemHeight');
+					}
+					// 将菜单菜单活动item垂直居中
+					this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight /
+						2;
+				})
+
 			},
 			// 获取一个目标元素的高度
 			getElRect(elClass, dataVal) {
@@ -178,14 +224,20 @@
 			},
 			toSearch() {
 				let arr = [];
-				this.list.map((item, index) => {
-					item.children.map((it, ix) => {
-						if (it[this.labelName].indexOf(this.keyword) >= 0) {
-							it['pname'] = item[this.labelName];
-							arr.push(it);
-						}
-					})
+				// this.list.map((item, index) => {
+				this.second.map((it, ix) => {
+					console.log(123)
+
+					console.log(it, ix)
+					console.log(it.secondName.indexOf(this.keyword))
+					if (it.secondName.indexOf(this.keyword) > -1 && this.keyword) {
+						// it['pname'] = item[this.secondName];
+						arr.push(it);
+					}
 				})
+
+				// })
+				console.log('arr', arr)
 				this.searchList = arr;
 			}
 		}
@@ -222,12 +274,13 @@
 		background-color: #FFFFFF;
 		position: absolute;
 		z-index: 10;
-		top: 200rpx;
+		// top: 200rpx;
 		left: 0;
 		width: 100%;
 	}
 
 	.u-menu-wrap {
+		padding-bottom: 100rpx;
 		flex: 1;
 		display: flex;
 		overflow: hidden;
@@ -275,7 +328,7 @@
 
 	.right-box {
 		background-color: white;
-		height: 93vh;
+		height: 100vh;
 		overflow: hidden;
 	}
 

+ 1 - 1
yinyuan/config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	baseUrlNew: 'http://121.5.163.150:8181',
-	// baseUrlNew: 'http://192.168.110.67:8081',
+	// baseUrlNew: 'http://192.168.110.82:8181',
 	// baseUrlNew: 'https://api.thesunbelt.shop',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 23 - 17
yinyuan/index.html

@@ -1,20 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title></title>
-    <!--preload-links-->
-    <!--app-context-->
-  </head>
-  <body>
-    <div id="app"><!--app-html--></div>
-    <script type="module" src="/main.js"></script>
-  </body>
+	<head>
+		<meta charset="UTF-8" />
+		<script src="https://cdn.jsdelivr.net/npm/eruda"></script>
+		<script>
+			eruda.init();
+		</script>
+		<script>
+			// var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+			// 	CSS.supports('top: constant(a)'))
+			// document.write(
+			// 	'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+			// 	(coverSupport ? ', viewport-fit=cover' : '') + '" />')
+		</script>
+		<title></title>
+		<!--preload-links-->
+		<!--app-context-->
+	</head>
+	<body>
+		<div id="app">
+			<!--app-html-->
+		</div>
+		<script type="module" src="/main.js"></script>
+	</body>
 </html>

+ 4 - 1
yinyuan/manifest.json

@@ -68,5 +68,8 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "template" : ""
+    }
 }

+ 0 - 6
yinyuan/pages/index/index.vue

@@ -125,17 +125,11 @@
 						})
 						uni.hideLoading()
 					}).then(res => {
-					// if (res.errno == 200) {
 					uni.hideLoading()
 					console.log(11)
 					console.log(res.data.items)
 					this.typeTwoData = res.data.items
-					// this.makeData(res.data)
-					// }
-
 				})
-				// this.makeData(res.data)
-				// }
 
 			})
 			// this.$request.baseRequest('admin.gubi.gubiTypeInfo', 'listInfo', failres => {

+ 55 - 18
yinyuan/pages/index/price.vue

@@ -6,19 +6,19 @@
 				</u-subsection>
 			</view>
 			<view class="row2" v-if="curNow!=2">
-				<text>{{type1}}</text><text>/</text><text>{{type2}}</text><text>/</text><text>{{type3}}</text>
+				<text>{{type}}</text>
 			</view>
 			<view class="row3" v-if="curNow==0">
-				<u-tabs :list="list1" @click="click" keyName="typeName" current='1'></u-tabs>
+				<u-tabs :list="list1" @click="click" keyName="typeId" :current='current' @change='tabChange'></u-tabs>
 			</view>
 		</view>
-		<view class="content2" v-if="curNow==0">
+		<view class="content2" v-if="curNow==0&&isSHowOther">
 			<view class="title">
 				价格趋势图
 			</view>
 			<qiun-data-charts type="line" :opts="opts" :chartData="chartData" :ontouch="true" />
 		</view>
-		<view class="content3" v-if="curNow==0">
+		<view class="content3" v-if="curNow==0&&isSHowOther">
 			<view class="title">
 				价格历史记录
 			</view>
@@ -45,8 +45,8 @@
 				</view>
 			</mescroll-body>
 		</view>
-		<mescroll-body v-if="curNow==1" ref="mescrollRef" @init="mescrollInit" @up="upCallback" :down="downOption"
-			:up="upOption">
+		<mescroll-body v-if="curNow==1&&isSHowOther" ref="mescrollRef" @init="mescrollInit" @up="upCallback"
+			:down="downOption" :up="upOption">
 			<view class="jyjl">
 				以下为近期成交数据
 			</view>
@@ -195,22 +195,50 @@
 		mixins: [MescrollMixin], // 使用mixin
 		onLoad() {
 			this.info = uni.getStorageSync("selectInfo")
-			this.list1 = this.info.children
-			if (this.info.children.length != 0) {
-				this.nowItem = this.info
-				this.orderId = this.info.children[1].id
-				this.type1 = this.info.series
-				this.type2 = this.info.secondName
-				this.type3 = this.info.children[1].typeId
-				// for (let i = 0; i < this.info.children.length; i++) {
+			// this.list1 = this.info.children
+			// if (this.info.children.length != 0) {
+			this.nowItem = this.info
+			// 	this.type1 = this.info.series
+			// 	this.type2 = this.info.secondName
+			// 	this.type3 = this.info.children[1].typeId
+			// 	// for (let i = 0; i < this.info.children.length; i++) {
 
-				// }
-			}
+			// 	// }
+			// }
+			this.$request.baseRequest('admin.gubi.gubiTypeThree', 'list', {
+					page: 1,
+					limit: 1000,
+					secondId: this.info.id
+				},
+				failres => {
+					console.log('res+++++', failres.errmsg)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+				uni.hideLoading()
+				console.log(11)
+				console.log(res.data.items)
+				this.list1 = res.data.items
+				for (let i = 0; i < this.list1.length; i++) {
+					if (this.list1[i].typeId == '45') {
+						this.type = this.list1[i].strFlag
+						this.orderId = this.list1[i].id
+						this.isSHowOther = true
+					}
+				}
+				// this.typeTwoData = res.data.items
+			})
 
 
 		},
 		data() {
 			return {
+				current: 1,
+				isSHowOther: false,
+				type: '',
 				selectSrc: '',
 				show: false,
 				x: [],
@@ -298,9 +326,18 @@
 			sectionChange(index) {
 				this.curNow = index;
 			},
+			tabChange(val) {
+				console.log(111)
+				this.current = val.index;
+				console.log(val.index)
+			},
 			click(item) {
 				this.orderId = item.id
-				this.type3 = item.typeId
+				for (let i = 0; i < this.list1.length; i++) {
+					if (this.list1[i].typeId == item.typeId) {
+						this.type = this.list1[i].strFlag
+					}
+				}
 				this.mescroll.resetUpScroll()
 			},
 			makeData(val) {
@@ -487,7 +524,7 @@
 	}
 
 	.price-img {
-		width: 200rpx;
+		width: 340rpx;
 	}
 
 	.right-row {

+ 3 - 4
yinyuan/pages/login/login.vue

@@ -70,13 +70,12 @@
 				})
 				this.$request.baseRequest('admin', 'login', this.userInfo, failres => {
 					console.log('res+++++', failres.errmsg)
-					this.$refs.uToast.show({
-						type: 'error',
-						message: failres.errmsg,
+					uni.showToast({
+						mask: true,
+						title: failres.errmsg
 					})
 					uni.hideLoading()
 				}).then(res => {
-					console.log(res)
 					if (res.errno == 200) {
 						uni.hideLoading()
 						uni.setStorageSync('userInfo', this.userInfo)

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio