shish 5 سال پیش
والد
کامیت
1d7d3d1b6b

+ 0 - 1
ghsApp/src/pagesArrears/details.vue

@@ -57,7 +57,6 @@
 				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >收款</button>
 				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >收款</button>
 			</view>
 			</view>
 		</view>
 		</view>
-    <kd-entrance></kd-entrance>
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>

+ 2 - 2
ghsApp/src/pagesArrears/detailsItem.vue

@@ -12,8 +12,8 @@
 				<view class="mark">{{ info.addTime }}</view>
 				<view class="mark">{{ info.addTime }}</view>
 			</view>
 			</view>
 			<view class="item-row">
 			<view class="item-row">
-				<view class="mark">成交金额:{{ info.actPrice }}</view>
-				<view class="price">{{ info.actPrice }}</view>
+				<view class="mark">成交金额:{{ info.realPrice }}</view>
+				<view class="price">{{ info.realPrice }}</view>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>

+ 0 - 1
ghsApp/src/pagesArrears/list.vue

@@ -35,7 +35,6 @@
 				</text>
 				</text>
 			</view>
 			</view>
 		</view>
 		</view>
-    <kd-entrance></kd-entrance>
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>

+ 2 - 2
hdApp/src/pagesPurchase/components/gatheringList.vue

@@ -21,8 +21,8 @@
         <view class="mark">{{ info.addTime }}</view>
         <view class="mark">{{ info.addTime }}</view>
       </view>
       </view>
       <view class="item-row">
       <view class="item-row">
-        <view class="mark">金额:{{ info.actPrice }}</view>
-        <view class="price">欠款: {{ info.actPrice }}</view>
+        <view class="mark">金额:{{ info.realPrice }}</view>
+        <view class="price">欠款: {{ info.realPrice }}</view>
       </view>
       </view>
     </view>
     </view>
   </view>
   </view>

+ 1 - 1
pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 			.once .sub-title {
 				color: #ababab;
 				color: #ababab;
 				font-size: 12px;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.a58774f9.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.a58774f9.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.36245ad3.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.36245ad3.js"></script></body></html>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/app.36245ad3.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-205a2464.1b8f35e6.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-205a2464.2cc9ae62.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.3fecc875.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.d0811fd2.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-2d0bd94e.c54db9f6.js


+ 8 - 6
pt/src/cool/request/index.js

@@ -37,6 +37,7 @@ import shopCapital from '@/service/shop-capital/index';
 import cash from '@/service/deposit/index';
 import cash from '@/service/deposit/index';
 import ptYeChange from '@/service/assets/ptYeChange/index';
 import ptYeChange from '@/service/assets/ptYeChange/index';
 import ptAsset from '@/service/ptAsset/index';
 import ptAsset from '@/service/ptAsset/index';
+import shopYeChange from '@/service/shop-ye-change/index';
 
 
 export function SET_SERVICE({ store }) {
 export function SET_SERVICE({ store }) {
 	// const files = require.context('@/service/', true, /\.js$/);
 	// const files = require.context('@/service/', true, /\.js$/);
@@ -74,12 +75,13 @@ export function SET_SERVICE({ store }) {
 		itemClass,
 		itemClass,
 		item,
 		item,
 		unit,
 		unit,
-    merchant,
-    shopAdmin,
-	shopCapital,
-    cash,
-	ptYeChange,
-	ptAsset
+		merchant,
+		shopAdmin,
+		shopCapital,
+		cash,
+		ptYeChange,
+		ptAsset,
+		shopYeChange
 	};
 	};
 
 
 	Vue.prototype.$service = modules;
 	Vue.prototype.$service = modules;

+ 1 - 2
pt/src/saas/shop/components/balance-detail.vue

@@ -73,8 +73,7 @@ export default {
 		},
 		},
 		onLoad({ ctx, app }) {
 		onLoad({ ctx, app }) {
 			this.app = app;
 			this.app = app;
-			// console.log(this.orderOperate,'orderOperate')
-			ctx.service(this.$service.ptYeChange)
+			ctx.service(this.$service.shopYeChange)
 				.set('table', {
 				.set('table', {
 					columns: [
 					columns: [
 						{
 						{

+ 6 - 0
pt/src/service/shop-ye-change/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool';
+
+@Service('shop-ye-change')
+export class ShopYeChangeService extends BaseService {}
+
+export default new ShopYeChangeService();

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است