shish 5 лет назад
Родитель
Сommit
f6ca8198cd

+ 0 - 1
ghsApp/src/admin/home/me.vue

@@ -127,7 +127,6 @@
       :selectItemId.sync="shopId"
       :selectItemId.sync="shopId"
       @selectSussess="selectSussess"
       @selectSussess="selectSussess"
     ></DorpdownSelect>
     ></DorpdownSelect>
-    <kd-entrance></kd-entrance>
   </view>
   </view>
 </template>
 </template>
 
 

+ 7 - 2
ghsApp/src/admin/home/workbench.vue

@@ -141,12 +141,17 @@ export default {
 			constant: this.$constant,
 			constant: this.$constant,
 			// 遮罩层
 			// 遮罩层
 			renewMask: false,
 			renewMask: false,
-      getappIdList: {},
+			getappIdList: {},
 			data: {
 			data: {
 				admin: {},
 				admin: {},
 				asset: {},
 				asset: {},
 				notice: {},
 				notice: {},
-				todayData: {}
+				todayData: {
+					income:0.00,
+					order:0,
+					custom:0,
+					expend:0.00
+				}
 			},
 			},
 			// 订单总览
 			// 订单总览
 			orderData: [
 			orderData: [

+ 1 - 3
ghsApp/src/pagesClient/official/renewal.vue

@@ -74,9 +74,7 @@ export default {
         url: "/admin/home/callback"
         url: "/admin/home/callback"
       });
       });
     },
     },
-    payFail() {
-      this.$msg("支付失败");
-    }
+    payFail() {}
   }
   }
 };
 };
 </script>
 </script>

+ 1 - 11
ghsApp/src/pagesShare/pay.vue

@@ -311,19 +311,9 @@ export default {
     },
     },
     // 支付成功
     // 支付成功
     paySuccess() {
     paySuccess() {
-      // alert('支付成功!')
-      // this.$util.pageTo({
-      //   url: "/pages/callback/index",
-      //   type: 2,
-      //   query: {
-      //     pageStatus: 3,
-      //     id: this.payCallData.orderId,
-      //     ...this.params
-      //   }
-      // });
     },
     },
     payFail() {
     payFail() {
-      alert("支付失败!");
+
     },
     },
   }
   }
 };
 };

+ 0 - 1
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -135,7 +135,6 @@
 				</button>
 				</button>
 			</view>
 			</view>
 		</view>
 		</view>
-    <kd-entrance></kd-entrance>
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>

+ 2 - 2
hdApp/src/admin/billing/affirmGhs.vue

@@ -235,8 +235,8 @@
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 					</tui-list-cell>
 					</tui-list-cell>
-						<!-- <appSendTime :placeholder="'默认30分钟配送'" @alterTime="purchaseFreight(ghsMsg)" :sendDate.sync="form.sendDate" :sendTime.sync="sendTime" ></appSendTime> -->
-            <appTimer :placeholder="'默认30分钟配送'" @confirm="onConfirm" :sendTime="sendTime"></appTimer>
+						<!-- <appSendTime :placeholder="'默认30分钟配送'" @alterTime="purchaseFreight(ghsMsg)" :sendDate.sync="form.sendDate" :sendTime.sync="sendTime" ></appSendTime> -->
+            <appTimer :placeholder="'默认30分钟配送'" @confirm="onConfirm" :sendTime="sendTime"></appTimer>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 						<view class="tui-title ">运费</view>
 						<view class="tui-title ">运费</view>
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder" disabled>
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder" disabled>

+ 1 - 1
hdApp/src/admin/home/me.vue

@@ -120,7 +120,7 @@
               :hover="false"
               :hover="false"
               :arrow="true"
               :arrow="true"
             >
             >
-              <div class="tui-title">优惠券</div>
+              <div class="tui-title">我的优惠券</div>
             </tui-list-cell>
             </tui-list-cell>
 
 
           </view>
           </view>

+ 6 - 1
hdApp/src/admin/home/workbench.vue

@@ -162,7 +162,12 @@ export default {
         admin: {},
         admin: {},
         asset: {},
         asset: {},
         notice: {},
         notice: {},
-        todayData: {}
+        todayData: {
+					income:0.00,
+					order:0,
+					custom:0,
+					expend:0.00
+        }
       },
       },
       // 订单总览
       // 订单总览
       orderData: [
       orderData: [

+ 1 - 1
hdApp/src/pagesClient/member/detail.vue

@@ -57,7 +57,7 @@
             <tui-list-cell class="line-cell" :hover="false">
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>
               <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
               <div class="switch_bx">
-                <text>已关闭</text>
+                <text></text>
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
               </div>
               </div>
             </tui-list-cell>
             </tui-list-cell>

+ 0 - 1
hdApp/src/pagesPurchase/purDetails.vue

@@ -161,7 +161,6 @@
     >
     >
       <view v-if="detailInfo.ghsShopAdminId == 0" @click="toPay">付款</view>
       <view v-if="detailInfo.ghsShopAdminId == 0" @click="toPay">付款</view>
     </view>
     </view>
-    <kd-entrance></kd-entrance>
   </view>
   </view>
 </template>
 </template>
 
 

+ 0 - 1
hdApp/src/pagesStorehouse/inventory/update.vue

@@ -142,7 +142,6 @@
 				</button>
 				</button>
 			</view>
 			</view>
 		</view>
 		</view>
-     <kd-entrance></kd-entrance>
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>